diff options
Diffstat (limited to 'app/models/application_setting_implementation.rb')
| -rw-r--r-- | app/models/application_setting_implementation.rb | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 8ef7e9a92a8..a5f262f2e1e 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -33,7 +33,7 @@ module ApplicationSettingImplementation DEFAULT_MINIMUM_PASSWORD_LENGTH = 8 class_methods do - def defaults + def defaults # rubocop:disable Metrics/AbcSize { admin_mode: false, after_sign_up_text: nil, @@ -41,6 +41,7 @@ module ApplicationSettingImplementation akismet_api_key: nil, allow_local_requests_from_system_hooks: true, allow_local_requests_from_web_hooks_and_services: false, + allow_possible_spam: false, asset_proxy_enabled: false, authorized_keys_enabled: true, # TODO default to false if the instance is configured to use AuthorizedKeysCommand commit_email_hostname: default_commit_email_hostname, @@ -105,6 +106,7 @@ module ApplicationSettingImplementation invisible_captcha_enabled: false, issues_create_limit: 300, jira_connect_application_key: nil, + jira_connect_public_key_storage_enabled: false, jira_connect_proxy_url: nil, local_markdown_version: 0, login_recaptcha_protection_enabled: false, @@ -248,7 +250,13 @@ module ApplicationSettingImplementation bulk_import_enabled: false, allow_runner_registration_token: true, user_defaults_to_private_profile: false - } + }.tap do |hsh| + hsh.merge!(non_production_defaults) unless Rails.env.production? + end + end + + def non_production_defaults + {} end def default_commit_email_hostname @@ -296,11 +304,11 @@ module ApplicationSettingImplementation end def domain_allowlist_raw - array_to_string(self.domain_allowlist) + array_to_string(domain_allowlist) end def domain_denylist_raw - array_to_string(self.domain_denylist) + array_to_string(domain_denylist) end def domain_allowlist_raw=(values) @@ -316,7 +324,7 @@ module ApplicationSettingImplementation end def outbound_local_requests_allowlist_raw - array_to_string(self.outbound_local_requests_whitelist) + array_to_string(outbound_local_requests_whitelist) end def outbound_local_requests_allowlist_raw=(values) @@ -349,7 +357,7 @@ module ApplicationSettingImplementation end def protected_paths_raw - array_to_string(self.protected_paths) + array_to_string(protected_paths) end def protected_paths_raw=(values) @@ -357,7 +365,7 @@ module ApplicationSettingImplementation end def notes_create_limit_allowlist_raw - array_to_string(self.notes_create_limit_allowlist) + array_to_string(notes_create_limit_allowlist) end def notes_create_limit_allowlist_raw=(values) @@ -365,7 +373,7 @@ module ApplicationSettingImplementation end def users_get_by_id_limit_allowlist_raw - array_to_string(self.users_get_by_id_limit_allowlist) + array_to_string(users_get_by_id_limit_allowlist) end def users_get_by_id_limit_allowlist_raw=(values) @@ -516,12 +524,6 @@ module ApplicationSettingImplementation static_objects_external_storage_url.present? end - # This will eventually be configurable - # https://gitlab.com/gitlab-org/gitlab/issues/208161 - def web_ide_clientside_preview_bundler_url - 'https://sandbox-prod.gitlab-static.net' - end - def ensure_key_restrictions! return if Gitlab::Database.read_only? return unless Gitlab::FIPS.enabled? @@ -535,7 +537,7 @@ module ApplicationSettingImplementation def set_max_key_restriction!(key_type) attr_name = "#{key_type}_key_restriction" - current = self.attributes[attr_name].to_i + current = attributes[attr_name].to_i return if current == KeyRestrictionValidator::FORBIDDEN @@ -548,7 +550,7 @@ module ApplicationSettingImplementation [min_size, current].max end - self.assign_attributes({ attr_name => new_value }) + assign_attributes({ attr_name => new_value }) end def separate_allowlists(string_array) |