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

Merge branch 'mrchrisw/remove-whitelist' into 'master'
061d1e2d · Robert Speicher · 8581df3b · 57e72cba · 061d1e2d
Commit 061d1e2d authored Oct 07, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

user.rb app/models/user.rb +1 -1

No files found.
--- 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