Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0361abd2
Commit
0361abd2
authored
Jun 26, 2019
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show position of merge trains in system notes
Show position always
parent
b831914a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
ee/app/services/ee/system_note_service.rb
ee/app/services/ee/system_note_service.rb
+1
-1
ee/changelogs/unreleased/show-position-of-merge-train-in-system-notes.yml
...released/show-position-of-merge-train-in-system-notes.yml
+5
-0
ee/spec/services/system_note_service_spec.rb
ee/spec/services/system_note_service_spec.rb
+1
-1
No files found.
ee/app/services/ee/system_note_service.rb
View file @
0361abd2
...
...
@@ -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'
))
...
...
ee/changelogs/unreleased/show-position-of-merge-train-in-system-notes.yml
0 → 100644
View file @
0361abd2
---
title
:
Show position of merge trains in system notes
merge_request
:
14398
author
:
type
:
fixed
ee/spec/services/system_note_service_spec.rb
View file @
0361abd2
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment