diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:04:54 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:04:54 +0100 |
commit | d3affe8bca5f5944c6819be1261cc4da7a2c9420 (patch) | |
tree | 047472310ccd89fb43a84101a6441917c461ebf1 /app/models | |
parent | e08aa3df905f09f1c964fb056cba922a1d6eaa85 (diff) | |
parent | 6cffcb05882b0d3c4a02f9acf21806e25ea09ec3 (diff) | |
download | gitlab-ce-d3affe8bca5f5944c6819be1261cc4da7a2c9420.tar.gz |
Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 0af60645545..89b6c49b362 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -346,10 +346,10 @@ 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 - issues = commits.flat_map { |c| c.closes_issues(current_user) } - issues.push(*Gitlab::ClosingIssueExtractor.new(project, current_user). - closed_by_message(description)) - issues.uniq(&:id) + messages = commits.map(&:safe_message) << description + + Gitlab::ClosingIssueExtractor.new(project, current_user). + closed_by_message(messages.join("\n")) else [] end |