diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-07-15 18:30:38 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-18 17:53:43 -0500 |
| commit | c71e658ccac85f111517e04b79d915c10867c7e3 (patch) | |
| tree | ffbea4cb96791b4f78ae0d9e4bb3b51f54cc8ecc /app/models/user.rb | |
| parent | a3f0f2cc4d9a4c689ae0eeae73e6d4ef19c39cce (diff) | |
| download | gitlab-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 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 0168008355b..6932e750fe0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -871,7 +871,7 @@ class User < ActiveRecord::Base end end - allowed_domains = current_application_settings.restricted_signup_domains + allowed_domains = current_application_settings.domain_whitelist unless allowed_domains.blank? if match_domain(allowed_domains, self.email) valid = true |