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
d285bb3d
Commit
d285bb3d
authored
Jul 02, 2020
by
peterhegman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update UI copy based on reviewer feedback
parent
ef5b6882
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
ee/app/views/groups/settings/_allowed_email_domain.html.haml
ee/app/views/groups/settings/_allowed_email_domain.html.haml
+3
-1
locale/gitlab.pot
locale/gitlab.pot
+4
-1
No files found.
ee/app/views/groups/settings/_allowed_email_domain.html.haml
View file @
d285bb3d
...
...
@@ -4,11 +4,13 @@
.form-group
%label
{
id:
label_id
}
=
_
(
'Restrict membership by email'
)
=
_
(
'Restrict membership by email
domain
'
)
.js-allowed-email-domains
{
data:
{
hidden_input_id:
hidden_input_id
,
label_id:
label_id
}
}
=
f
.
hidden_field
:allowed_email_domains_list
,
id:
hidden_input_id
.form-text.text-muted
-
read_more_link
=
link_to
(
_
(
'Read more'
),
help_page_path
(
'user/group/index'
,
anchor:
'allowed-domain-restriction-premium'
))
=
_
(
'Only verified users with an email address in any of these domains can be added to the group.'
)
%br
=
_
(
'Multiple domains are supported.'
)
%br
=
_
(
'Some common domains are not allowed. %{read_more_link}.'
).
html_safe
%
{
read_more_link:
read_more_link
}
locale/gitlab.pot
View file @
d285bb3d
...
...
@@ -14799,6 +14799,9 @@ msgstr ""
msgid "MrDeploymentActions|Stop environment"
msgstr ""
msgid "Multiple domains are supported."
msgstr ""
msgid "Multiple issue boards"
msgstr ""
...
...
@@ -19478,7 +19481,7 @@ msgstr ""
msgid "Restrict access by IP address"
msgstr ""
msgid "Restrict membership by email"
msgid "Restrict membership by email
domain
"
msgstr ""
msgid "Restricts sign-ups for email addresses that match the given regex. See the %{supported_syntax_link_start}supported syntax%{supported_syntax_link_end} for more information."
...
...
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