diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-15 15:32:15 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-18 13:46:06 +0100 |
| commit | 851697a82e75ed66d6028cfe3e4be8543740e28f (patch) | |
| tree | 7dabed817a0557b76f4235c6655a68457bab5c52 /app/models/application_setting.rb | |
| parent | 19356faa8164329317a00eb5d225386ab09280c5 (diff) | |
| download | gitlab-ce-851697a82e75ed66d6028cfe3e4be8543740e28f.tar.gz | |
Make runners token encryption to be optional
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 cd36c963ee5..44551d791f2 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 DOMAIN_LIST_SEPARATOR = %r{\s*[,;]\s* # comma or semicolon, optionally surrounded by whitespace |