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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
41815285
Commit
41815285
authored
Nov 28, 2016
by
Gabriel Gizotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better `Closes issues` text for MergeRequest#merge_commit_message
parent
e97c7100
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/models/merge_request.rb
app/models/merge_request.rb
+2
-1
No files found.
app/models/merge_request.rb
View file @
41815285
...
@@ -637,7 +637,8 @@ class MergeRequest < ActiveRecord::Base
...
@@ -637,7 +637,8 @@ class MergeRequest < ActiveRecord::Base
message
<<
"
#{
title
}
\n\n
"
message
<<
"
#{
title
}
\n\n
"
if
closes_issues_references
.
present?
if
closes_issues_references
.
present?
message
<<
"Closed Issues:
#{
closes_issues_references
.
join
(
", "
)
}
\n\n
"
issue_text
=
'issue'
.
pluralize
(
closes_issues_references
.
size
)
message
<<
"Closes
#{
issue_text
}
#{
closes_issues_references
.
to_sentence
}
\n\n
"
end
end
message
<<
"
#{
description
}
\n\n
"
if
include_description
&&
description
.
present?
message
<<
"
#{
description
}
\n\n
"
if
include_description
&&
description
.
present?
...
...
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