Commit 8a37bdae authored by Wayne Haber's avatar Wayne Haber Committed by Denys Mishunov
parent ed050950
...@@ -2166,7 +2166,7 @@ class User < ApplicationRecord ...@@ -2166,7 +2166,7 @@ class User < ApplicationRecord
end end
def signup_email_invalid_message def signup_email_invalid_message
self.new_record? ? _('is not allowed for sign-up.') : _('is not allowed.') self.new_record? ? _('is not allowed for sign-up. Please use your regular email address.') : _('is not allowed. Please use your regular email address.')
end end
def check_username_format def check_username_format
......
...@@ -43463,7 +43463,7 @@ msgstr "" ...@@ -43463,7 +43463,7 @@ msgstr ""
msgid "is not a valid X509 certificate." msgid "is not a valid X509 certificate."
msgstr "" msgstr ""
msgid "is not allowed for sign-up." msgid "is not allowed for sign-up. Please use your regular email address."
msgstr "" msgstr ""
msgid "is not allowed for this group." msgid "is not allowed for this group."
...@@ -43475,7 +43475,7 @@ msgstr "" ...@@ -43475,7 +43475,7 @@ msgstr ""
msgid "is not allowed since the group is not top-level group." msgid "is not allowed since the group is not top-level group."
msgstr "" msgstr ""
msgid "is not allowed." msgid "is not allowed. Please use your regular email address."
msgstr "" msgstr ""
msgid "is not allowed. We do not currently support project-level iterations" msgid "is not allowed. We do not currently support project-level iterations"
......
...@@ -498,7 +498,7 @@ RSpec.describe User do ...@@ -498,7 +498,7 @@ RSpec.describe User do
end end
describe 'email' do describe 'email' do
let(:expected_error) { _('is not allowed for sign-up. Check with your administrator.') } let(:expected_error) { _('is not allowed for sign-up. Please use your regular email address. Check with your administrator.') }
context 'when no signup domains allowed' do context 'when no signup domains allowed' do
before do before do
...@@ -550,7 +550,7 @@ RSpec.describe User do ...@@ -550,7 +550,7 @@ RSpec.describe User do
user = create(:user, email: "info@test.example.com") user = create(:user, email: "info@test.example.com")
expect { user.update!(email: "test@notexample.com") } expect { user.update!(email: "test@notexample.com") }
.to raise_error(StandardError, 'Validation failed: Email is not allowed. Check with your administrator.') .to raise_error(StandardError, 'Validation failed: Email is not allowed. Please use your regular email address. Check with your administrator.')
end end
end end
...@@ -623,7 +623,7 @@ RSpec.describe User do ...@@ -623,7 +623,7 @@ RSpec.describe User do
user = create(:user, email: 'info@test.com') user = create(:user, email: 'info@test.com')
expect { user.update!(email: 'info@example.com') } expect { user.update!(email: 'info@example.com') }
.to raise_error(StandardError, 'Validation failed: Email is not allowed. Check with your administrator.') .to raise_error(StandardError, 'Validation failed: Email is not allowed. Please use your regular email address. Check with your administrator.')
end end
end end
...@@ -700,7 +700,7 @@ RSpec.describe User do ...@@ -700,7 +700,7 @@ RSpec.describe User do
user = create(:user, email: 'info@test.com') user = create(:user, email: 'info@test.com')
expect { user.update!(email: 'info@gitlab.com') } expect { user.update!(email: 'info@gitlab.com') }
.to raise_error(StandardError, 'Validation failed: Email is not allowed. Check with your administrator.') .to raise_error(StandardError, 'Validation failed: Email is not allowed. Please use your regular email address. Check with your administrator.')
end end
it 'does accept a valid email address' do it 'does accept a valid email address' do
......
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