summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-10-07 12:42:43 +0000
committerRobert Speicher <robert@gitlab.com>2016-10-07 12:42:43 +0000
commit061d1e2d680ac940e1325842d5258b0b512c3d3c (patch)
tree09c686e6e482a2a9deacd9a13dfa898c61c43e5c
parent8581df3bfb9e847d07a585a22cfa21658ae40ea2 (diff)
parent57e72cbac99d58fe4dbb23439d6f9f2a333feccc (diff)
downloadgitlab-ce-061d1e2d680ac940e1325842d5258b0b512c3d3c.tar.gz
Merge branch 'mrchrisw/remove-whitelist' into 'master'
Update user whitelist reject message ## What does this MR do? Makes email whitelist rejection message more generic. Stops printing all `allowed_domains` ## Why was this MR needed? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23090 See merge request !6731
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 508efd85050..892ac28d5b3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -902,7 +902,7 @@ class User < ActiveRecord::Base
if domain_matches?(allowed_domains, self.email)
valid = true
else
- error = "is not whitelisted. Email domains valid for registration are: #{allowed_domains.join(', ')}"
+ error = "domain is not authorized for sign-up"
valid = false
end
end