Merge branch '65631-rename-approval-rule' into 'master'

Rename approval rule

See merge request gitlab-org/gitlab-ee!15141

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

@@ -222,7 +222,7 @@ export default {
     <div class="row">
       <div v-if="settings.allowMultiRule" class="form-group col-sm-6">
         <label class="label-wrapper">
-          <span class="mb-2 bold inline">{{ s__('ApprovalRule|Name') }}</span>
+          <span class="mb-2 bold inline">{{ s__('ApprovalRule|Rule name') }}</span>
           <input
             v-model="name"
             :class="{ 'is-invalid': validation.name }"

ee/changelogs/unreleased/65631-rename-approval-rule.yml

+---
+title: Rename approval rule
+merge_request: 15140
+author:
+type: other

ee/spec/features/merge_request/user_edits_approval_rules_mr_spec.rb

@@ -53,7 +53,7 @@ describe 'Merge request > User edits MR with approval rules', :js do
 
     click_button "Add approvers"
 
-    fill_in "Name", with: rule_name
+    fill_in "Rule name", with: rule_name
 
     add_approval_rule_member('user', approver.name)
 

locale/gitlab.pot

@@ -1659,6 +1659,9 @@ msgstr ""
 msgid "ApprovalRule|No. approvals required"
 msgstr ""
 
+msgid "ApprovalRule|Rule name"
+msgstr ""
+
 msgid "ApprovalRule|e.g. QA, Security, etc."
 msgstr ""