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 /config | |
| 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 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 51d93e8cde0..693507e0bec 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -212,7 +212,7 @@ Settings.gitlab.default_projects_features['builds'] = true if Settin Settings.gitlab.default_projects_features['container_registry'] = true if Settings.gitlab.default_projects_features['container_registry'].nil? Settings.gitlab.default_projects_features['visibility_level'] = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE) Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive') if Settings.gitlab['repository_downloads_path'].nil? -Settings.gitlab['restricted_signup_domains'] ||= [] +Settings.gitlab['domain_whitelist'] ||= [] Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project] Settings.gitlab['trusted_proxies'] ||= [] |