diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:06:19 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:06:19 +0100 |
| commit | 15a1acb4796406155fb01c2d93747b66697f50c0 (patch) | |
| tree | 1ab73338bfa9bf2e56f8238d532e627f9e1f5b38 /app/models/merge_request.rb | |
| parent | b67f8eee0d2810be4a010c5e968e1848b4ca3c88 (diff) | |
| parent | 6cffcb05882b0d3c4a02f9acf21806e25ea09ec3 (diff) | |
| download | gitlab-ce-15a1acb4796406155fb01c2d93747b66697f50c0.tar.gz | |
Merge remote-tracking branch 'origin/master' into git-raw-workhorse
Diffstat (limited to 'app/models/merge_request.rb')
| -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 |