Merge branch 'eread/improve-mr-approval-settings-ui-text' into 'master'

Fix contextual help link and other minor improvements

See merge request gitlab-org/gitlab!68838

ee/app/assets/javascripts/approvals/components/group_settings/app.vue

@@ -29,7 +29,7 @@ export default {
   },
   i18n: {
     groupSettingsHeader: __('Merge request approvals'),
-    groupSettingsDescription: __('Define approval settings. %{linkStart}Learn more.%{linkEnd}'),
+    groupSettingsDescription: __('Define approval rules. %{linkStart}Learn more.%{linkEnd}'),
   },
   labels: GROUP_APPROVAL_SETTINGS_LABELS_I18N,
 };

ee/app/assets/javascripts/approvals/components/security_configuration/unconfigured_security_rules.vue

@@ -64,7 +64,7 @@ export default {
             'SecurityApprovals|Test coverage must be enabled. %{linkStart}Learn more%{linkEnd}.',
           ),
           enableDescription: s__(
-            'SecurityApprovals|Requires approval for decreases in test coverage. %{linkStart}More information%{linkEnd}',
+            'SecurityApprovals|Requires approval for decreases in test coverage. %{linkStart}Learn more.%{linkEnd}',
           ),
           docsPath: this.coverageCheckHelpPagePath,
         },

ee/app/assets/javascripts/approvals/constants.js

@@ -52,9 +52,7 @@ export const APPROVALS_HELP_PATH = 'user/project/merge_requests/approvals/settin
 export const APPROVAL_SETTINGS_I18N = {
   learnMore: __('Learn more.'),
   approvalSettingsHeader: __('Approval settings'),
-  approvalSettingsDescription: __(
-    'Define how approval rules are applied as a merge request moves toward completion.',
-  ),
+  approvalSettingsDescription: __('Define how approval rules are applied to merge requests.'),
   saveChanges: __('Save changes'),
   loadingErrorMessage: s__(
     'ApprovalSettings|There was an error loading merge request approval settings.',

ee/app/views/admin/push_rules/_merge_request_approvals.html.haml

@@ -2,11 +2,11 @@
 %section.settings.merge-request-approval-settings.no-animate{ class: ('expanded' if expanded_by_default?) }
   .settings-header
     %h4
-      = _('Merge request (MR) approvals')
+      = _('Merge request approvals')
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Regulate approvals by authors/committers. Affects all projects.')
+      = _('Configure approvals by authors and committers on all projects.')
 
     = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'merge-request-approval-settings'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@application_setting)

ee/app/views/admin/push_rules/_merge_request_approvals_fields.html.haml

@@ -2,8 +2,8 @@
   %legend.h5.gl-border-none
     = _('Approval settings')
   %p
-    = _("Define how approval rules are applied as a merge request moves toward completion.")
-    = link_to _("Learn more."), help_page_path("user/project/merge_requests/approvals/settings.md"), target: '_blank'
+    = _("Define how approval rules are applied to merge requests.")
+    = link_to _("Learn more."), help_page_path("user/admin_area/merge_requests_approvals.md"), target: '_blank', rel: 'noopener noreferrer'
   .gl-form-checkbox-group
     .gl-form-checkbox.custom-control.custom-checkbox
       = f.check_box :prevent_merge_requests_author_approval, class: 'custom-control-input'

ee/app/views/projects/_merge_request_approvals_settings.html.haml

@@ -3,11 +3,11 @@
 
 %section.settings.merge-requests-feature.no-animate#js-merge-request-approval-settings{ class: [('expanded' if expanded)], data: { qa_selector: 'merge_request_approvals_settings_content' } }
   .settings-header
-    %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Merge request (MR) approvals')
+    %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Merge request approvals')
     %button.gl-button.btn.btn-default.js-settings-toggle{ type: 'button' }= expanded ? _("Collapse") : _("Expand")
     %p
-      = _("Define approval settings.")
-      = link_to _("Learn more."), help_page_path("user/project/merge_requests/approvals/index.md"), target: '_blank'
+      = _("Define approval rules.")
+      = link_to _("Learn more."), help_page_path("user/project/merge_requests/approvals/index.md"), target: '_blank', rel: 'noopener noreferrer'
 
   .settings-content
     = render 'projects/merge_request_approvals_settings_form'

ee/spec/frontend/approvals/components/approval_settings_spec.js

@@ -160,7 +160,7 @@ describe('ApprovalSettings', () => {
 
       expect(findForm().text()).toContain('Approval settings');
       expect(findForm().text()).toContain(
-        'Define how approval rules are applied as a merge request moves toward completion.',
+        'Define how approval rules are applied to merge requests.',
       );
     });
 

ee/spec/views/admin/push_rules/_merge_request_approvals.html.haml_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe 'admin/push_rules/_merge_request_approvals' do
   it 'shows settings form', :aggregate_failures do
     render
 
-    expect(rendered).to have_content(_('Merge request (MR) approvals'))
-    expect(rendered).to have_content(_('Regulate approvals by authors/committers. Affects all projects.'))
+    expect(rendered).to have_content(_('Merge request approvals'))
+    expect(rendered).to have_content(_('Configure approvals by authors and committers on all projects.'))
   end
 end

locale/gitlab.pot

@@ -8481,6 +8481,9 @@ msgstr ""
 msgid "Configure a %{codeStart}.gitlab-webide.yml%{codeEnd} file in the %{codeStart}.gitlab%{codeEnd} directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}"
 msgstr ""
 
+msgid "Configure approvals by authors and committers on all projects."
+msgstr ""
+
 msgid "Configure existing installation"
 msgstr ""
 
@@ -10716,10 +10719,10 @@ msgstr ""
 msgid "Define a custom pattern with cron syntax"
 msgstr ""
 
-msgid "Define approval settings."
+msgid "Define approval rules."
 msgstr ""
 
-msgid "Define approval settings. %{linkStart}Learn more.%{linkEnd}"
+msgid "Define approval rules. %{linkStart}Learn more.%{linkEnd}"
 msgstr ""
 
 msgid "Define custom rules for what constitutes spam, independent of Akismet"
@@ -10728,7 +10731,7 @@ msgstr ""
 msgid "Define environments in the deploy stage(s) in %{code_open}.gitlab-ci.yml%{code_close} to track deployments here."
 msgstr ""
 
-msgid "Define how approval rules are applied as a merge request moves toward completion."
+msgid "Define how approval rules are applied to merge requests."
 msgstr ""
 
 msgid "Definition"
@@ -21032,9 +21035,6 @@ msgstr ""
 msgid "Merge request %{mr_link} was reviewed by %{mr_author}"
 msgstr ""
 
-msgid "Merge request (MR) approvals"
-msgstr ""
-
 msgid "Merge request analytics"
 msgstr ""
 
@@ -27673,9 +27673,6 @@ msgstr ""
 msgid "Registry setup"
 msgstr ""
 
-msgid "Regulate approvals by authors/committers. Affects all projects."
-msgstr ""
-
 msgid "Reindexing Status: %{status} (Slice multiplier: %{multiplier}, Maximum running slices: %{max_slices})"
 msgstr ""
 
@@ -29549,7 +29546,7 @@ msgstr ""
 msgid "SecurityApprovals|Requires approval for Denied licenses. %{linkStart}More information%{linkEnd}"
 msgstr ""
 
-msgid "SecurityApprovals|Requires approval for decreases in test coverage. %{linkStart}More information%{linkEnd}"
+msgid "SecurityApprovals|Requires approval for decreases in test coverage. %{linkStart}Learn more.%{linkEnd}"
 msgstr ""
 
 msgid "SecurityApprovals|Requires approval for vulnerabilities. %{linkStart}Learn more.%{linkEnd}"