diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-13 18:30:56 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-13 18:30:56 +0000 |
| commit | b35378a938e22f745b6c6ea32b53cb50f9b6c627 (patch) | |
| tree | 8d95e7145a177b61916999d5c2df974db0b0901d /app/models | |
| parent | 44406ae8db5587eabda2c69aef886f8c512b2ac3 (diff) | |
| parent | 217937e5699326e2897a8919f421b401d077225c (diff) | |
| download | gitlab-ce-b35378a938e22f745b6c6ea32b53cb50f9b6c627.tar.gz | |
Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master'
Show mentioned/issues being closed from a Merge Requests title
Closes #24333
See merge request !9194
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
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 |