diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-03-19 12:36:50 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-03-19 12:36:50 +0300 |
| commit | bfe4bdccc12f01bd33420f3e252a583c7fc0bb53 (patch) | |
| tree | 09d294feed293f294cfe37bdf085c8102e4a7176 /app/models/application_setting.rb | |
| parent | afeb2dd98e4a32a4f5355a59c6db1e599707e9c2 (diff) | |
| parent | 851697a82e75ed66d6028cfe3e4be8543740e28f (diff) | |
Merge branch 'make-tokens-encryption-optional-for-now' into 'master'
Make runners token encryption to be optional
See merge request gitlab-org/gitlab-ce!26223
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 56cc7c3784f..9cc7c0a1b97 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -7,7 +7,7 @@ class ApplicationSetting < ActiveRecord::Base include IgnorableColumn include ChronicDurationAttribute - add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption) ? :optional : :required } + add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption, default_enabled: true) ? :optional : :required } add_authentication_token_field :health_check_access_token # Include here so it can override methods from |