Commit 061d1e2d authored by Robert Speicher's avatar Robert Speicher

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
parents 8581df3b 57e72cba
...@@ -902,7 +902,7 @@ class User < ActiveRecord::Base ...@@ -902,7 +902,7 @@ class User < ActiveRecord::Base
if domain_matches?(allowed_domains, self.email) if domain_matches?(allowed_domains, self.email)
valid = true valid = true
else else
error = "is not whitelisted. Email domains valid for registration are: #{allowed_domains.join(', ')}" error = "domain is not authorized for sign-up"
valid = false valid = false
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment