diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 21:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 21:08:47 +0000 |
| commit | e4ea43b2b85ad5f3115f00220601eb719705139a (patch) | |
| tree | 1888a43f802e45ebb8dfed59595a790807777c6f /app/models/application_setting.rb | |
| parent | 390582e118752426acf5cb25ec99103d312d891c (diff) | |
| download | gitlab-ce-e4ea43b2b85ad5f3115f00220601eb719705139a.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 10d15e84b8d..0bea5d7b399 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -142,7 +142,7 @@ class ApplicationSetting < ApplicationRecord if: :auto_devops_enabled? validates :enabled_git_access_protocol, - inclusion: { in: %w(ssh http), allow_blank: true, allow_nil: true } + inclusion: { in: %w(ssh http), allow_blank: true } validates :domain_blacklist, presence: { message: 'Domain blacklist cannot be empty if Blacklist is enabled.' }, |