Merge branch '12564-email-regex' into 'master'

Adjust placeholder to solve misleading regex

Closes #12564

See merge request gitlab-org/gitlab!18235

changelogs/unreleased/12564-email-regex.yml

+---
+title: Adjust placeholder to solve misleading regex
+merge_request: 18235
+author:
+type: fixed

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'

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 ""