summaryrefslogtreecommitdiff
path: root/app/services/application_settings
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2019-08-22 15:50:50 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2019-08-22 16:42:02 +0200
commit30f302d2beb78af896213850c570792ce3d88b97 (patch)
treec867d22a3e6269c11f0a99f4cc7069da18d74d70 /app/services/application_settings
parent842b4d4ab59f19f7311b7f39948e699a6924fd52 (diff)
downloadgitlab-ce-30f302d2beb78af896213850c570792ce3d88b97.tar.gz
Don't check external authorization when disabling the service
Diffstat (limited to 'app/services/application_settings')
-rw-r--r--app/services/application_settings/update_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/application_settings/update_service.rb b/app/services/application_settings/update_service.rb
index 471df6e2d0c..13718734844 100644
--- a/app/services/application_settings/update_service.rb
+++ b/app/services/application_settings/update_service.rb
@@ -7,7 +7,8 @@ module ApplicationSettings
attr_reader :params, :application_setting
def execute
- validate_classification_label(application_setting, :external_authorization_service_default_label)
+ disable_ext_auth = params[:external_authorization_service_enabled].present? && !Gitlab::Utils.to_boolean(params[:external_authorization_service_enabled])
+ validate_classification_label(application_setting, :external_authorization_service_default_label) unless disable_ext_auth
if application_setting.errors.any?
return false