diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-06-13 16:19:08 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-06-13 17:25:44 +0200 |
| commit | 3f1ece26909f90e538a50cd724b64da28f0b7308 (patch) | |
| tree | 1f10f7efef48602ef910d71b0f3411d34654e57a /app/models/merge_request.rb | |
| parent | 5fdcaadf347e41109f20a4dee733f5b51030feda (diff) | |
| download | gitlab-ce-3f1ece26909f90e538a50cd724b64da28f0b7308.tar.gz | |
Detect closing issues in Merge Request description
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index a501870115f..bfea209bf6d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -220,7 +220,9 @@ class MergeRequest < ActiveRecord::Base # Return the set of issues that will be closed if this merge request is accepted. def closes_issues if target_branch == project.default_branch - commits.map { |c| c.closes_issues(project) }.flatten.uniq.sort_by(&:id) + issues = commits.flat_map { |c| c.closes_issues(project) } + issues += Gitlab::ClosingIssueExtractor.closed_by_message_in_project(description, project) + issues.uniq.sort_by(&:id) else [] end |