diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2019-08-22 15:50:50 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2019-08-22 16:42:02 +0200 |
| commit | 30f302d2beb78af896213850c570792ce3d88b97 (patch) | |
| tree | c867d22a3e6269c11f0a99f4cc7069da18d74d70 | |
| parent | 842b4d4ab59f19f7311b7f39948e699a6924fd52 (diff) | |
| download | gitlab-ce-30f302d2beb78af896213850c570792ce3d88b97.tar.gz | |
Don't check external authorization when disabling the service
| -rw-r--r-- | app/services/application_settings/update_service.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/66443-unrecoverable-configuration-loop-in-external-auth-control.yml | 5 |
2 files changed, 7 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 diff --git a/changelogs/unreleased/66443-unrecoverable-configuration-loop-in-external-auth-control.yml b/changelogs/unreleased/66443-unrecoverable-configuration-loop-in-external-auth-control.yml new file mode 100644 index 00000000000..ab52e3e5a2c --- /dev/null +++ b/changelogs/unreleased/66443-unrecoverable-configuration-loop-in-external-auth-control.yml @@ -0,0 +1,5 @@ +--- +title: Don't check external authorization when disabling the service +merge_request: 32102 +author: Robert Schilling +type: fixed |