diff --git a/ee/app/services/ee/system_notes/merge_requests_service.rb b/ee/app/services/ee/system_notes/merge_requests_service.rb index 1cebf3120e1757319729a55c0ec2bce2747c0269..167c066b22c8e2627069d73d4bc23e4fb863435e 100644 --- a/ee/app/services/ee/system_notes/merge_requests_service.rb +++ b/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 diff --git a/ee/spec/services/system_notes/merge_requests_service_spec.rb b/ee/spec/services/system_notes/merge_requests_service_spec.rb index a5b3700c8af36f68fdb67b4a94d5e54851712c63..2e2075d941b63b52aec54f6cf077d1a155801a41 100644 --- a/ee/spec/services/system_notes/merge_requests_service_spec.rb +++ b/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