diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-07-19 17:08:40 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-19 17:08:40 -0500 |
| commit | 1a057d2b4013feb151e77aa71dd0b5a83412d2d6 (patch) | |
| tree | d301a9de92f6bcd8c715e5ee9b09b62ee92825ec | |
| parent | 4be1adea21a5994be948b42a04cb20ecd3714db1 (diff) | |
| download | gitlab-ce-email-domain-blacklist.tar.gz | |
Reorder allowed params for `ApplicationSetting` and add more details to docs.email-domain-blacklist
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 6 | ||||
| -rw-r--r-- | doc/api/settings.md | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index c5b44ff8c44..9e1dc15de84 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -85,6 +85,9 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :default_snippet_visibility, :default_group_visibility, :domain_whitelist_raw, + :domain_blacklist_enabled, + :domain_blacklist_raw, + :domain_blacklist_file, :version_check_enabled, :admin_notification_email, :user_oauth_applications, @@ -113,9 +116,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :container_registry_token_expire_delay, :repository_storage, :enabled_git_access_protocol, - :domain_blacklist_enabled, - :domain_blacklist_raw, - :domain_blacklist_file, restricted_visibility_levels: [], import_sources: [], disabled_oauth_sign_in_sources: [] diff --git a/doc/api/settings.md b/doc/api/settings.md index c925fa1861e..ea39b32561c 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -34,6 +34,8 @@ Example response: "home_page_url" : null, "default_snippet_visibility" : 0, "domain_whitelist" : [], + "domain_blacklist_enabled" : false, + "domain_blacklist" : [], "created_at" : "2016-01-04T15:44:55.176Z", "default_project_visibility" : 0, "gravatar_enabled" : true, @@ -64,6 +66,8 @@ PUT /application/settings | `default_project_visibility` | integer | no | What visibility level new projects receive. Can take `0` _(Private)_, `1` _(Internal)_ and `2` _(Public)_ as a parameter. Default is `0`.| | `default_snippet_visibility` | integer | no | What visibility level new snippets receive. Can take `0` _(Private)_, `1` _(Internal)_ and `2` _(Public)_ as a parameter. Default is `0`.| | `domain_whitelist` | array of strings | no | Force people to use only corporate emails for sign-up. Default is null, meaning there is no restriction. | +| `domain_blacklist_enabled` | boolean | no | Enable/disable the `domain_blacklist` | +| `domain_blacklist` | array of strings | yes (if `domain_whitelist_enabled` is `true` | People trying to sign-up with emails from this domain will not be allowed to do so. | | `user_oauth_applications` | boolean | no | Allow users to register any application to use GitLab as an OAuth provider | | `after_sign_out_path` | string | no | Where to redirect users after logout | | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes | @@ -94,6 +98,8 @@ Example response: "default_project_visibility": 1, "default_snippet_visibility": 0, "domain_whitelist": [], + "domain_blacklist_enabled" : false, + "domain_blacklist" : [], "user_oauth_applications": true, "after_sign_out_path": "", "container_registry_token_expire_delay": 5, |