Merge branch 'stkerr-audit-message-text' into 'master'

Correct audit message text to mention committers instead of reviewers

See merge request gitlab-org/gitlab!72623

doc/administration/audit_events.md

@@ -128,6 +128,10 @@ From there, you can see the following actions:
 - Release was updated
 - Release milestone associations changed
 - Permission to approve merge requests by committers was updated ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7531) in GitLab 12.9)
+- Permission to approve merge requests by committers was updated.
+  - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7531) in GitLab 12.9.
+  - Message for event [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72623/diffs) in GitLab 14.6.
+
 - Permission to approve merge requests by authors was updated ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7531) in GitLab 12.9)
 - Number of required approvals was updated ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7531) in GitLab 12.9)
 - Added or removed users and groups from project approval groups ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213603) in GitLab 13.2)

doc/api/audit_events.md

@@ -277,7 +277,7 @@ Example response:
     "entity_id": 7,
     "entity_type": "Project",
     "details": {
-        "change": "prevent merge request approval from reviewers",
+        "change": "prevent merge request approval from committers",
         "from": "",
         "to": "true",
         "author_name": "Administrator",
@@ -336,7 +336,7 @@ Example response:
   "entity_id": 7,
   "entity_type": "Project",
   "details": {
-      "change": "prevent merge request approval from reviewers",
+      "change": "prevent merge request approval from committers",
       "from": "",
       "to": "true",
       "author_name": "Administrator",

ee/lib/ee/audit/project_changes_auditor.rb

@@ -12,7 +12,7 @@ module EE
         audit_changes(:packages_enabled, as: 'packages_enabled', model: model)
 
         audit_changes(:merge_requests_author_approval, as: 'prevent merge request approval from authors', model: model)
-        audit_changes(:merge_requests_disable_committers_approval, as: 'prevent merge request approval from reviewers', model: model)
+        audit_changes(:merge_requests_disable_committers_approval, as: 'prevent merge request approval from committers', model: model)
         audit_changes(:reset_approvals_on_push, as: 'require new approvals when new commits are added to an MR', model: model)
         audit_changes(:disable_overriding_approvers_per_merge_request, as: 'prevent users from modifying MR approval rules in merge requests', model: model)
         audit_changes(:require_password_to_approve, as: 'require user password for approvals', model: model)

ee/spec/features/projects/audit_events_spec.rb

@@ -168,7 +168,7 @@ RSpec.describe 'Projects > Audit Events', :js do
           page.within('.audit-log-table') do
             expect(page).to have_content(project.owner.name)
             expect(page).to have_content('Changed prevent merge request approval from authors')
-            expect(page).to have_content('Changed prevent merge request approval from reviewers')
+            expect(page).to have_content('Changed prevent merge request approval from committers')
             expect(page).to have_content(project.name)
           end
         end

ee/spec/lib/ee/audit/project_changes_auditor_spec.rb

@@ -160,7 +160,7 @@ RSpec.describe EE::Audit::ProjectChangesAuditor do
         aggregate_failures do
           expect { foo_instance.execute }.to change { AuditEvent.count }.by(1)
           expect(AuditEvent.last.details).to include(
-            change: 'prevent merge request approval from reviewers',
+            change: 'prevent merge request approval from committers',
             from: true,
             to: false
           )