diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-20 20:26:00 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-20 20:26:00 +0000 |
| commit | 22c8e21bf432a68f05bd81685d76acc0a3c9607f (patch) | |
| tree | 3d113695853db1348f31d1fbc1fbe17590aecefa /app/controllers/admin | |
| parent | 5a77eb153669bfbac4ab1f05615d11965beb826d (diff) | |
| parent | 1a057d2b4013feb151e77aa71dd0b5a83412d2d6 (diff) | |
| download | gitlab-ce-22c8e21bf432a68f05bd81685d76acc0a3c9607f.tar.gz | |
Merge branch 'email-domain-blacklist' into 'master'
Added the ability to block sign ups using a domain blacklist.
As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read.
Fixes #19749
Related to #5573
See merge request !5259
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 23ba83aba0e..9e1dc15de84 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -64,6 +64,7 @@ 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.delete(:domain_blacklist_raw) if params[:domain_blacklist_file] params.require(:application_setting).permit( :default_projects_limit, @@ -83,7 +84,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :default_project_visibility, :default_snippet_visibility, :default_group_visibility, - :restricted_signup_domains_raw, + :domain_whitelist_raw, + :domain_blacklist_enabled, + :domain_blacklist_raw, + :domain_blacklist_file, :version_check_enabled, :admin_notification_email, :user_oauth_applications, |