Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJan Christophersen <jan@ruken.pw>2017-02-13 18:04:06 +0300
committerJan Christophersen <jan@ruken.pw>2017-02-13 18:47:47 +0300
commit217937e5699326e2897a8919f421b401d077225c (patch)
treeb533771081db8e74362d460d7720d9773a3eb0ab /app
parent027a4bd274d7060e35cfe225765c917d7de25b31 (diff)
Show mentioned/issues being closed from a Merge Requests title
Diffstat (limited to 'app')
-rw-r--r--app/models/merge_request.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index c0d4dd0197f..38646eba3ac 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -561,7 +561,7 @@ class MergeRequest < ActiveRecord::Base
# Return the set of issues that will be closed if this merge request is accepted.
def closes_issues(current_user = self.author)
if target_branch == project.default_branch
- messages = [description]
+ messages = [title, description]
messages.concat(commits.map(&:safe_message)) if merge_request_diff
Gitlab::ClosingIssueExtractor.new(project, current_user).
@@ -575,7 +575,7 @@ class MergeRequest < ActiveRecord::Base
return [] unless target_branch == project.default_branch
ext = Gitlab::ReferenceExtractor.new(project, current_user)
- ext.analyze(description)
+ ext.analyze("#{title}\n#{description}")
ext.issues - closes_issues(current_user)
end