summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2017-07-05 11:45:58 +0100
committerTiago Botelho <tiagonbotelho@hotmail.com>2017-07-05 19:20:52 +0100
commit197a5df42aa65821aaa8fa628244e27ee8e1b016 (patch)
tree12fb3601bfb5457cd0ac4e797541f061aadde056 /app/controllers/admin
parent81dba76b9d7d120cd22e3619a4058bd4885be9bc (diff)
downloadgitlab-ce-197a5df42aa65821aaa8fa628244e27ee8e1b016.tar.gz
Allow admin to disable all restricted visibility levels32408-enable-disable-all-restricted-visibility-levels
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/application_settings_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 4d4b8a8425f..f978ce478c7 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -71,6 +71,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
params[:application_setting][:disabled_oauth_sign_in_sources] =
AuthHelper.button_based_providers.map(&:to_s) -
Array(enabled_oauth_sign_in_sources)
+
+ params[:application_setting][:restricted_visibility_levels]&.delete("")
params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
params.require(:application_setting).permit(