Merge branch 'mjang-okr-issue-300594' into 'master'

Update Emails on push UI text

See merge request gitlab-org/gitlab!58597

app/models/project_services/emails_on_push_service.rb

@@ -72,7 +72,7 @@ class EmailsOnPushService < Service
     domains = Notify.allowed_email_domains.map { |domain| "user@#{domain}" }.join(", ")
     [
       { type: 'checkbox', name: 'send_from_committer_email', title: s_("EmailsOnPushService|Send from committer"),
-        help: s_("EmailsOnPushService|Send notifications from the committer's email address if the domain is part of the domain GitLab is running on (e.g. %{domains}).") % { domains: domains } },
+        help: s_("EmailsOnPushService|Send notifications from the committer's email address if the domain matches the domain used by your GitLab instance (such as %{domains}).") % { domains: domains } },
       { type: 'checkbox', name: 'disable_diffs', title: s_("EmailsOnPushService|Disable code diffs"),
         help: s_("EmailsOnPushService|Don't include possibly sensitive code diffs in notification body.") },
       { type: 'select', name: 'branches_to_be_notified', choices: branch_choices },

changelogs/unreleased/mjang-okr-issue-300594.yml

+---
+title: Update Emails on push UI Text to match style guidelines
+merge_request: 58597
+author:
+type: other

doc/user/project/integrations/emails_on_push.md

@@ -18,9 +18,9 @@ The following options are available:
 
 - **Push events** - Email is triggered when a push event is received.
 - **Tag push events** - Email is triggered when a tag is created and pushed.
-- **Send from committer** - Send notifications from the committer's email address if the domain is part of the domain GitLab is running on (e.g. `user@gitlab.com`).
+- **Send from committer** - Send notifications from the committer's email address if the domain matches the domain used by your GitLab instance (such as `user@gitlab.com`).
 - **Disable code diffs** - Don't include possibly sensitive code diffs in notification body.
 
 | Settings | Notification |
 | --- | --- |
-| ![Email on push service settings](img/emails_on_push_service.png) | ![Email on push notification](img/emails_on_push_email.png) |
+| ![Email on push service settings](img/emails_on_push_service_v13_11.png) | ![Email on push notification](img/emails_on_push_email.png) |

locale/gitlab.pot

@@ -11640,7 +11640,7 @@ msgstr ""
 msgid "EmailsOnPushService|Send from committer"
 msgstr ""
 
-msgid "EmailsOnPushService|Send notifications from the committer's email address if the domain is part of the domain GitLab is running on (e.g. %{domains})."
+msgid "EmailsOnPushService|Send notifications from the committer's email address if the domain matches the domain used by your GitLab instance (such as %{domains})."
 msgstr ""
 
 msgid "EmailsOnPushService|can't exceed %{recipients_limit}"

spec/serializers/service_field_entity_spec.rb

@@ -72,7 +72,7 @@ RSpec.describe ServiceFieldEntity do
           }
 
           is_expected.to include(expected_hash)
-          expect(subject[:help]).to include("Send notifications from the committer's email address if the domain is part of the domain GitLab is running on")
+          expect(subject[:help]).to include("Send notifications from the committer's email address if the domain matches the domain used by your GitLab instance")
         end
       end