Merge branch '299335-mr-approval-rule-being-treated-abnormally-at-project-level' into 'master'

Standardize project-level MR approval rule label

See merge request gitlab-org/gitlab!57194

doc/user/project/merge_requests/merge_request_approvals.md

@@ -322,7 +322,7 @@ Regardless of the approval rules you choose for your project, users can edit the
 request, overriding the rules you set as [default](#adding--editing-a-default-approval-rule).
 To prevent that from happening:
 
-1. Uncheck the **Allow overrides to approval lists per merge request (MR).** checkbox.
+1. Select the **Prevent users from modifying MR approval rules in merge requests.** checkbox.
 1. Click **Save changes**.
 
 #### Resetting approvals on push

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

@@ -13,4 +13,4 @@
     .gl-form-checkbox.custom-control.custom-checkbox
       = f.check_box :disable_overriding_approvers_per_merge_request , class: 'custom-control-input'
       = f.label :disable_overriding_approvers_per_merge_request , class: 'custom-control-label' do
-        = _('Prevent users from modifying MR approval rules.')
+        = _('Prevent users from modifying MR approval rules in projects and merge requests.')

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

@@ -24,9 +24,9 @@
 
   .gl-form-checkbox-group
     .gl-form-checkbox.custom-control.custom-checkbox
-      = form.check_box(:disable_overriding_approvers_per_merge_request, { class: 'custom-control-input', disabled: !can_modify_approvers }, false, true)
+      = form.check_box(:disable_overriding_approvers_per_merge_request, { class: 'custom-control-input', disabled: !can_modify_approvers })
       = form.label :disable_overriding_approvers_per_merge_request, class: 'custom-control-label' do
-        %span= _('Allow overrides to approval lists per merge request (MR)')
+        %span= _('Prevent users from modifying MR approval rules in merge requests.')
         = link_to sprite_icon('question-o'), help_page_path('user/project/merge_requests/merge_request_approvals', anchor: 'prevent-overriding-default-approvals'), target: '_blank'
 
     .gl-form-checkbox.custom-control.custom-checkbox

ee/changelogs/unreleased/299335-standardize-MR-approval-rule-input-label.yml

+---
+title: Standardize input label for project-level MR rule for overriding approvers
+merge_request: 57194
+author:
+type: changed

ee/spec/features/admin/admin_merge_requests_approvals_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe 'Admin interacts with merge requests approvals settings' do
     page.within('.merge-request-approval-settings') do
       check 'Prevent MR approvals by author.'
       check 'Prevent MR approvals from users who make commits to the MR.'
-      check 'Prevent users from modifying MR approval rules.'
+      check _('Prevent users from modifying MR approval rules in projects and merge requests.')
       click_button('Save changes')
     end
 
@@ -30,15 +30,14 @@ RSpec.describe 'Admin interacts with merge requests approvals settings' do
 
     expect(find_field('Prevent MR approvals by author.')).to be_checked
     expect(find_field('Prevent MR approvals from users who make commits to the MR.')).to be_checked
-    expect(find_field('Prevent users from modifying MR approval rules.')).to be_checked
+    expect(find_field(_('Prevent users from modifying MR approval rules in projects and merge requests.'))).to be_checked
 
     visit edit_project_path(project)
 
     page.within('#js-merge-request-approval-settings') do
       expect(find('#project_merge_requests_author_approval')).to be_disabled.and be_checked
       expect(find('#project_merge_requests_disable_committers_approval')).to be_disabled.and be_checked
-      expect(find('#project_disable_overriding_approvers_per_merge_request')).to be_disabled
-      expect(find('#project_disable_overriding_approvers_per_merge_request')).not_to be_checked
+      expect(find('#project_disable_overriding_approvers_per_merge_request')).to be_disabled.and be_checked
     end
   end
 end

locale/gitlab.pot

@@ -3155,9 +3155,6 @@ msgstr ""
 msgid "Allow only the selected protocols to be used for Git access."
 msgstr ""
 
-msgid "Allow overrides to approval lists per merge request (MR)"
-msgstr ""
-
 msgid "Allow owners to manage default branch protection per group"
 msgstr ""
 
@@ -23297,7 +23294,10 @@ msgstr ""
 msgid "Prevent users from changing their profile name"
 msgstr ""
 
-msgid "Prevent users from modifying MR approval rules."
+msgid "Prevent users from modifying MR approval rules in merge requests."
+msgstr ""
+
+msgid "Prevent users from modifying MR approval rules in projects and merge requests."
 msgstr ""
 
 msgid "Prevent users from performing write operations on GitLab while performing maintenance."