Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8bede438
Commit
8bede438
authored
Mar 26, 2020
by
nicolasdular
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change wording for sign up regex restrictions
parent
9a9ef1cd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/user.rb
app/models/user.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
spec/models/user_spec.rb
spec/models/user_spec.rb
+1
-1
No files found.
app/models/user.rb
View file @
8bede438
...
...
@@ -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
...
...
locale/gitlab.pot
View file @
8bede438
...
...
@@ -24028,7 +24028,7 @@ msgstr ""
msgid "is not a valid X509 certificate."
msgstr ""
msgid "is not allowed
for sign-up
"
msgid "is not allowed
. Try again with a different email address, or contact your GitLab admin.
"
msgstr ""
msgid "is not an email you own"
...
...
spec/models/user_spec.rb
View file @
8bede438
...
...
@@ -529,7 +529,7 @@ describe User, :do_not_mock_admin_mode do
user
=
build
(
:user
,
email:
'info@gitlab.com'
)
expect
(
user
).
not_to
be_valid
expect
(
user
.
errors
.
messages
[
:email
].
first
).
to
eq
(
_
(
'is not allowed
for sign-up
'
))
expect
(
user
.
errors
.
messages
[
:email
].
first
).
to
eq
(
_
(
'is not allowed
. Try again with a different email address, or contact your GitLab admin.
'
))
end
it
'does accept a valid email address'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment