summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-07-15 18:30:38 -0500
committerPatricio Cano <suprnova32@gmail.com>2016-07-18 17:53:43 -0500
commitc71e658ccac85f111517e04b79d915c10867c7e3 (patch)
treeffbea4cb96791b4f78ae0d9e4bb3b51f54cc8ecc /config
parenta3f0f2cc4d9a4c689ae0eeae73e6d4ef19c39cce (diff)
downloadgitlab-ce-c71e658ccac85f111517e04b79d915c10867c7e3.tar.gz
Refactor and rename `restricted_signup_domains` to `domain_whitelist` to better conform to its behavior and newly introduced behavior.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb2
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'] ||= []