diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 12:06:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 12:06:19 +0000 |
| commit | 38c79b697f45a949701b9961e87b7c9b8de75abf (patch) | |
| tree | bae163aa8d437f74ea4086b93fb6b3c2e0f9013f /app/models/application_setting.rb | |
| parent | 2b7a5214342baa2575b35868316ea9413d2afe1f (diff) | |
| download | gitlab-ce-38c79b697f45a949701b9961e87b7c9b8de75abf.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index cfae79ec016..07335b6a883 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -18,12 +18,6 @@ class ApplicationSetting < ApplicationRecord # fix a lot of tests using allow_any_instance_of include ApplicationSettingImplementation - attr_encrypted :asset_proxy_secret_key, - mode: :per_attribute_iv, - insecure_mode: true, - key: Settings.attr_encrypted_db_key_base_truncated, - algorithm: 'aes-256-cbc' - serialize :restricted_visibility_levels # rubocop:disable Cop/ActiveRecordSerialize serialize :import_sources # rubocop:disable Cop/ActiveRecordSerialize serialize :disabled_oauth_sign_in_sources, Array # rubocop:disable Cop/ActiveRecordSerialize @@ -286,6 +280,12 @@ class ApplicationSetting < ApplicationRecord pass: :external_auth_client_key_pass, if: -> (setting) { setting.external_auth_client_cert.present? } + attr_encrypted :asset_proxy_secret_key, + mode: :per_attribute_iv, + key: Settings.attr_encrypted_db_key_base_truncated, + algorithm: 'aes-256-cbc', + insecure_mode: true + attr_encrypted :external_auth_client_key, mode: :per_attribute_iv, key: Settings.attr_encrypted_db_key_base_truncated, |