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 /lib/api/entities.rb | |
| 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 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index d7e74582459..fbf0d74663f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -414,7 +414,9 @@ module API expose :default_project_visibility expose :default_snippet_visibility expose :default_group_visibility - expose :restricted_signup_domains + expose :domain_whitelist + expose :domain_blacklist_enabled + expose :domain_blacklist expose :user_oauth_applications expose :after_sign_out_path expose :container_registry_token_expire_delay |