From e4ea43b2b85ad5f3115f00220601eb719705139a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 27 Jan 2020 21:08:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/application_setting.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/application_setting.rb') 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.' }, -- cgit v1.2.3