From f7d0932d2e001728b6e00a2bdd222a802f0c180f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 13 Jun 2015 10:40:03 +0200 Subject: [PATCH] Improve wording for approve comment Signed-off-by: Dmitriy Zaporozhets --- app/services/system_note_service.rb | 4 ++-- spec/services/system_note_service_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index fc548fc06b..104fd69cd0 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -262,11 +262,11 @@ class SystemNoteService # # Example Note text: # - # "Approved by @rspeicher" + # "Approved this merge request" # # Returns the created Note object def self.approve_mr(noteable, user) - body = "Approved by @#{user.username}" + body = "Approved this merge request" create_note(noteable: noteable, project: noteable.project, author: user, note: body) end diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 064e4536fa..6b83a21bf7 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -449,9 +449,9 @@ describe SystemNoteService do it_behaves_like 'a system note' - context 'when assignee added' do + context 'when merge request approved' do it 'sets the note text' do - expect(subject.note).to eq "Approved by @#{author.username}" + expect(subject.note).to eq "Approved this merge request" end end end