diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-18 03:08:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-18 03:08:58 +0300 |
| commit | 099333e261623df9b960419e2761b2cbb0eb3882 (patch) | |
| tree | 47d05cc18d6b20a16982b33e00bd1d144563f9e3 /app/models | |
| parent | a0b4a462b0c6f333651ae9e0c0ca1e5794e7b4e1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 3 | ||||
| -rw-r--r-- | app/models/application_setting_implementation.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 44eb2fefb3f..dbc09a3c9b2 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -465,6 +465,9 @@ class ApplicationSetting < ApplicationRecord length: { maximum: 100, message: N_('is too long (maximum is 100 entries)') }, allow_nil: false + validates :admin_mode, + inclusion: { in: [true, false], message: _('must be a boolean value') } + attr_encrypted :asset_proxy_secret_key, mode: :per_attribute_iv, key: Settings.attr_encrypted_db_key_base_truncated, diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index c067199b52c..dba72f88986 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -35,6 +35,7 @@ module ApplicationSettingImplementation class_methods do def defaults { + admin_mode: false, after_sign_up_text: nil, akismet_enabled: false, allow_local_requests_from_system_hooks: true, |