diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 15:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 15:07:51 +0000 |
| commit | 4e9acbfba3682c552b3de707c535e6257ef41054 (patch) | |
| tree | 8b1fd5f89ad3f1be68d8944815b13bb7d498e4a6 /app/models/user.rb | |
| parent | 506d6dcd7c787ba71a8a53102f3d4fdb6adcfa5e (diff) | |
| download | gitlab-ce-4e9acbfba3682c552b3de707c535e6257ef41054.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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 8709bfb18fd..b147c7d4d48 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1825,7 +1825,7 @@ class User < ApplicationRecord return if restrictions.blank? if Gitlab::UntrustedRegexp.new(restrictions).match?(email) - errors.add(:email, _('is not allowed for sign-up')) + errors.add(:email, _('is not allowed. Try again with a different email address, or contact your GitLab admin.')) end end |