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
Boxiang Sun
gitlab-ce
Commits
f5046e52
Commit
f5046e52
authored
Aug 23, 2017
by
haseeb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] changelog entry added for full merge request ref changes
parent
f2251d19
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/models/merge_request.rb
app/models/merge_request.rb
+0
-1
changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml
.../36262_merge_request_reference_in_merge_commit_global.yml
+5
-0
No files found.
app/models/merge_request.rb
View file @
f5046e52
...
@@ -682,7 +682,6 @@ class MergeRequest < ActiveRecord::Base
...
@@ -682,7 +682,6 @@ class MergeRequest < ActiveRecord::Base
if
!
include_description
&&
closes_issues_references
.
present?
if
!
include_description
&&
closes_issues_references
.
present?
message
<<
"Closes
#{
closes_issues_references
.
to_sentence
}
"
message
<<
"Closes
#{
closes_issues_references
.
to_sentence
}
"
end
end
message
<<
"
#{
description
}
"
if
include_description
&&
description
.
present?
message
<<
"
#{
description
}
"
if
include_description
&&
description
.
present?
message
<<
"See merge request
#{
to_reference
(
full:
true
)
}
"
message
<<
"See merge request
#{
to_reference
(
full:
true
)
}
"
...
...
changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml
0 → 100644
View file @
f5046e52
---
title
:
Merge request reference in merge commit changed to full reference
merge_request
:
13518
author
:
haseebeqx
type
:
fixed
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