Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
199119da
Commit
199119da
authored
Jul 20, 2020
by
Gilang Gumilar
Committed by
Fabio Pitino
Jul 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable application_settings_tokens_optional_encryption feature flag
parent
61c2b486
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/models/application_setting.rb
app/models/application_setting.rb
+1
-1
changelogs/unreleased/214382-remove-application_settings_tokens_optional_encryption-feature-fla.yml
...ation_settings_tokens_optional_encryption-feature-fla.yml
+5
-0
No files found.
app/models/application_setting.rb
View file @
199119da
...
@@ -9,7 +9,7 @@ class ApplicationSetting < ApplicationRecord
...
@@ -9,7 +9,7 @@ class ApplicationSetting < ApplicationRecord
GRAFANA_URL_ERROR_MESSAGE
=
'Please check your Grafana URL setting in '
\
GRAFANA_URL_ERROR_MESSAGE
=
'Please check your Grafana URL setting in '
\
'Admin Area > Settings > Metrics and profiling > Metrics - Grafana'
'Admin Area > Settings > Metrics and profiling > Metrics - Grafana'
add_authentication_token_field
:runners_registration_token
,
encrypted:
->
{
Feature
.
enabled?
(
:application_settings_tokens_optional_encryption
,
default_enabled:
true
)
?
:optional
:
:required
}
add_authentication_token_field
:runners_registration_token
,
encrypted:
->
{
Feature
.
enabled?
(
:application_settings_tokens_optional_encryption
)
?
:optional
:
:required
}
add_authentication_token_field
:health_check_access_token
add_authentication_token_field
:health_check_access_token
add_authentication_token_field
:static_objects_external_storage_auth_token
add_authentication_token_field
:static_objects_external_storage_auth_token
...
...
changelogs/unreleased/214382-remove-application_settings_tokens_optional_encryption-feature-fla.yml
0 → 100644
View file @
199119da
---
title
:
Disable application_settings_tokens_optional_encryption feature flag.
merge_request
:
31798
author
:
Gilang Gumilar
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment