diff --git a/changelogs/unreleased/12564-email-regex.yml b/changelogs/unreleased/12564-email-regex.yml new file mode 100644 index 0000000000000000000000000000000000000000..68f489d31ef1c80c8208b36145101254d16343c3 --- /dev/null +++ b/changelogs/unreleased/12564-email-regex.yml @@ -0,0 +1,5 @@ +--- +title: Adjust placeholder to solve misleading regex +merge_request: 18235 +author: +type: fixed diff --git a/ee/app/views/shared/push_rules/_form.html.haml b/ee/app/views/shared/push_rules/_form.html.haml index 6ccb3b6fa240cedd5e8cfd223bbb92392f8929ac..0a1d06ecd8b8a0f959e490e2f77c398cff749b8c 100644 --- a/ee/app/views/shared/push_rules/_form.html.haml +++ b/ee/app/views/shared/push_rules/_form.html.haml @@ -55,7 +55,7 @@ .form-group = 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 All commit author's email must match this = link_to 'regular expression', 'https://github.com/google/re2/wiki/Syntax' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0efaa04625c6341011e49c36f744dcbd66057a04..be2ab49fc4cdc98ba0c79d2f03ba03102fa2fd4b 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6519,6 +6519,9 @@ msgstr "" msgid "Everything you need to create a GitLab Pages site using plain HTML." msgstr "" +msgid "Example: @sub\\.company\\.com$" +msgstr "" + msgid "Example: Usage = single query. (Requested) / (Capacity) = multiple queries combined into a formula." msgstr ""