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
84e6a514
Commit
84e6a514
authored
Oct 14, 2019
by
Samantha Ming
Committed by
Martin Wortschack
Oct 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust placeholder to solve misleading regex
parent
e0df60c2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
changelogs/unreleased/12564-email-regex.yml
changelogs/unreleased/12564-email-regex.yml
+5
-0
ee/app/views/shared/push_rules/_form.html.haml
ee/app/views/shared/push_rules/_form.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
changelogs/unreleased/12564-email-regex.yml
0 → 100644
View file @
84e6a514
---
title
:
Adjust placeholder to solve misleading regex
merge_request
:
18235
author
:
type
:
fixed
ee/app/views/shared/push_rules/_form.html.haml
View file @
84e6a514
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
.form-group
.form-group
=
f
.
label
:author_email_regex
,
"Commit author's email"
,
class:
"label-bold"
=
f
.
label
:author_email_regex
,
"Commit author's email"
,
class:
"label-bold"
=
f
.
text_field
:author_email_regex
,
class:
"form-control"
,
placeholder:
'Example: @my-company.com$'
,
data:
{
qa_selector:
'author_email_field'
}
=
f
.
text_field
:author_email_regex
,
class:
"form-control"
,
placeholder:
_
(
'Example: @sub\.company\.com$'
)
,
data:
{
qa_selector:
'author_email_field'
}
.form-text.text-muted
.form-text.text-muted
All commit author's email must match this
All commit author's email must match this
=
link_to
'regular expression'
,
'https://github.com/google/re2/wiki/Syntax'
=
link_to
'regular expression'
,
'https://github.com/google/re2/wiki/Syntax'
...
...
locale/gitlab.pot
View file @
84e6a514
...
@@ -6519,6 +6519,9 @@ msgstr ""
...
@@ -6519,6 +6519,9 @@ msgstr ""
msgid "Everything you need to create a GitLab Pages site using plain HTML."
msgid "Everything you need to create a GitLab Pages site using plain HTML."
msgstr ""
msgstr ""
msgid "Example: @sub\\.company\\.com$"
msgstr ""
msgid "Example: Usage = single query. (Requested) / (Capacity) = multiple queries combined into a formula."
msgid "Example: Usage = single query. (Requested) / (Capacity) = multiple queries combined into a formula."
msgstr ""
msgstr ""
...
...
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