Merge branch 'russell/ui-text-abuse-reports' into 'master'

Edit UI text of Abuse reports settings

See merge request gitlab-org/gitlab!71276

app/views/admin/application_settings/_abuse.html.haml

@@ -5,7 +5,5 @@
     .form-group
       = f.label :abuse_notification_email, _('Abuse reports notification email'), class: 'label-bold'
       = f.text_field :abuse_notification_email, class: 'form-control gl-form-input'
-      .form-text.text-muted
-        = _('Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.')
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

app/views/admin/application_settings/reporting.html.haml

@@ -20,6 +20,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Set notification email for abuse reports.')
+      = _('Receive notification of abuse reports by email.')
+      = link_to _('Learn more.'), help_page_path('user/admin_area/review_abuse_reports.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     = render 'abuse'

locale/gitlab.pot

@@ -1691,9 +1691,6 @@ msgstr ""
 msgid "Abuse reports notification email"
 msgstr ""
 
-msgid "Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area."
-msgstr ""
-
 msgid "Accept invitation"
 msgstr ""
 
@@ -27925,6 +27922,9 @@ msgstr ""
 msgid "Receive any notifications from GitLab."
 msgstr ""
 
+msgid "Receive notification of abuse reports by email."
+msgstr ""
+
 msgid "Receive notifications about your own activity"
 msgstr ""
 
@@ -30988,9 +30988,6 @@ msgstr ""
 msgid "Set new password"
 msgstr ""
 
-msgid "Set notification email for abuse reports."
-msgstr ""
-
 msgid "Set parent epic to an epic"
 msgstr ""