Commit 0361abd2 authored by Shinya Maeda's avatar Shinya Maeda

Show position of merge trains in system notes

Show position always
parent b831914a
......@@ -197,7 +197,7 @@ module EE
body = if index == 0
'started a merge train'
else
"added this merge request to the merge train at index #{index}"
"added this merge request to the merge train at position #{index + 1}"
end
create_note(NoteSummary.new(noteable, project, author, body, action: 'merge'))
......
---
title: Show position of merge trains in system notes
merge_request: 14398
author:
type: fixed
......@@ -343,7 +343,7 @@ describe SystemNoteService do
end
it "posts the 'merge train' system note" do
expect(subject.note).to eq('added this merge request to the merge train at index 1')
expect(subject.note).to eq('added this merge request to the merge train at position 2')
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment