diff options
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 9347d82e9e5..af55f86aa0b 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -19,7 +19,7 @@ class ApplicationSetting < ApplicationRecord 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 - serialize :outbound_requests_whitelist, Array # rubocop:disable Cop/ActiveRecordSerialize + serialize :outbound_local_requests_whitelist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :domain_whitelist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :domain_blacklist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize @@ -118,10 +118,6 @@ class ApplicationSetting < ApplicationRecord validates :enabled_git_access_protocol, inclusion: { in: %w(ssh http), allow_blank: true, allow_nil: true } - validates :outbound_requests_whitelist, - presence: { message: 'Outbound requests whitelist cannot be activated if local requests from hooks and services is enabled.' }, - if: :allow_local_requests_from_hooks_and_services? - validates :domain_blacklist, presence: { message: 'Domain blacklist cannot be empty if Blacklist is enabled.' }, if: :domain_blacklist_enabled? |