diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-05-02 06:53:32 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-05-02 09:36:52 -0700 |
| commit | eb4f1eb5f55fe3630c9191db1b9da2dc92437391 (patch) | |
| tree | 6aab55f8ab6f46e3126fff4f4e7ae36712cec0f7 /app/controllers/admin/application_settings_controller.rb | |
| parent | cfbff017d0ba1ba4fd896b4762b23853f123c60a (diff) | |
| download | gitlab-ce-eb4f1eb5f55fe3630c9191db1b9da2dc92437391.tar.gz | |
Add application setting to restrict user signups to e-mail domains
This feature was requested long ago:
http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains
This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.
Only restrict e-mail addresses upon creation
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 8f6a766635a..3975e30835e 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -41,7 +41,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :max_attachment_size, :default_project_visibility, :default_snippet_visibility, - restricted_visibility_levels: [] + :restricted_signup_domains_raw, + restricted_visibility_levels: [], ) end end |