diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-07-18 17:49:33 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-18 17:53:43 -0500 |
| commit | 6b8eceda395ae25b7ea189627b04da1f223c57d7 (patch) | |
| tree | 89e7030c542055743f67bedfa7f8a35bb540b3ca /app/models/application_setting.rb | |
| parent | 23afb02aaa957dd1a5ce35a141e4e8ecd80052ca (diff) | |
| download | gitlab-ce-6b8eceda395ae25b7ea189627b04da1f223c57d7.tar.gz | |
Default to manual input for `domain_whitelist`, syntax fixes and added new tests.
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 d923b4d5235..8c19d9dc9c8 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -71,7 +71,7 @@ class ApplicationSetting < ActiveRecord::Base inclusion: { in: %w(ssh http), allow_blank: true, allow_nil: true } validates :domain_blacklist, - presence: true, + presence: { message: 'Domain blacklist cannot be empty if Blacklist is enabled.' }, if: :domain_blacklist_enabled? validates_each :restricted_visibility_levels do |record, attr, value| |