From f726df26c28666e640e566d50f363994e71cf681 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 16 Oct 2015 00:51:25 -0700
Subject: [PATCH] Reorder system note verb to say "Restored source branch X"
instead of "Source branch X restored"
---
app/services/system_note_service.rb | 4 ++--
spec/services/merge_requests/refresh_service_spec.rb | 2 +-
spec/services/system_note_service_spec.rb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index c0a5c3aeb53..37f454cfc3f 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -179,7 +179,7 @@ class SystemNoteService
#
# Example Note text:
#
- # "Target branch `feature` deleted"
+ # "Restored target branch `feature`"
#
# Returns the created Note object
def self.change_branch_presence(noteable, project, author, branch_type, branch, presence)
@@ -189,7 +189,7 @@ class SystemNoteService
else
'deleted'
end
- body = "#{branch_type.to_s} branch `#{branch}` #{verb}".capitalize
+ body = "#{verb} #{branch_type.to_s} branch `#{branch}`".capitalize
create_note(noteable: noteable, project: project, author: author, note: body)
end
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 463cd594fb0..227ac995ec2 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -121,7 +121,7 @@ describe MergeRequests::RefreshService do
expect(@merge_request).to be_open
notes = @fork_merge_request.notes.reorder(:created_at).map(&:note)
- expect(notes[0]).to include('Source branch `master` restored')
+ expect(notes[0]).to include('Restored source branch `master`')
expect(notes[1]).to include('Added 4 commits')
expect(@fork_merge_request).to be_open
end
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 699b2e3441f..a45130bd473 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -249,7 +249,7 @@ describe SystemNoteService do
context 'when source branch deleted' do
it 'sets the note text' do
- expect(subject.note).to eq "Source branch `feature` deleted"
+ expect(subject.note).to eq "Deleted source branch `feature`"
end
end
end
--
GitLab