Merge branch 'slashmanov/revoke-to-reset-approvals' into 'master'

Change revoked approvals to reset approvals

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143274



Merged-by: Kerri Miller <kerrizor@kerrizor.com>
Approved-by: Amy Qualls <aqualls@gitlab.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>
Co-authored-by: Stanislav Lashmanov <slashmanov@gitlab.com>

ee/app/services/ee/system_notes/merge_requests_service.rb

@@ -13,7 +13,7 @@ def merge_when_checks_pass(sha)
       #
       # Example Note text:
       #
-      # "revoked approvals from @user3, @user4, and @user5 by pushing to the branch"
+      # "reset approvals from @user3, @user4, and @user5 by pushing to the branch"
       #
       # Returns the created Note object
       def approvals_reset(cause, approvers)
@@ -21,7 +21,7 @@ def approvals_reset(cause, approvers)
         return unless cause == :new_push
         return if approvers.empty?
 
-        body = "revoked approvals from #{approvers.map(&:to_reference).to_sentence} by pushing to the branch"
+        body = "reset approvals from #{approvers.map(&:to_reference).to_sentence} by pushing to the branch"
 
         create_note(NoteSummary.new(noteable, project, author, body, action: 'approvals_reset'))
       end

ee/spec/services/system_notes/merge_requests_service_spec.rb

@@ -45,7 +45,7 @@
 
     it 'sets the note text' do
       expect(approvals_reset_note.note)
-        .to eq("revoked approvals from #{approvers.map(&:to_reference).to_sentence} by pushing to the branch")
+        .to eq("reset approvals from #{approvers.map(&:to_reference).to_sentence} by pushing to the branch")
     end
 
     context 'when cause is not new_push' do