diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-26 08:47:09 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-26 08:47:09 +0100 |
| commit | a2eff1a8e55b4bf513d3d752fcd6477595813dc2 (patch) | |
| tree | e7d5e3e097ef85b871c7ab5b4673e6903c294144 /app/models/issue.rb | |
| parent | 13f170fc5d182da78c3d0a7a0885628f59420ea0 (diff) | |
| parent | 3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff) | |
| download | gitlab-ce-a2eff1a8e55b4bf513d3d752fcd6477595813dc2.tar.gz | |
Merge branch 'master' into issue-board-sidebarissue-board-sidebar
Diffstat (limited to 'app/models/issue.rb')
| -rw-r--r-- | app/models/issue.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index ef92ac27b46..e356fe06363 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -211,7 +211,13 @@ class Issue < ActiveRecord::Base note.all_references(current_user, extractor: ext) end - ext.merge_requests.select { |mr| mr.open? && mr.closes_issue?(self) } + merge_requests = ext.merge_requests.select(&:open?) + if merge_requests.any? + ids = MergeRequestsClosingIssues.where(merge_request_id: merge_requests.map(&:id), issue_id: id).pluck(:merge_request_id) + merge_requests.select { |mr| mr.id.in?(ids) } + else + [] + end end def moved? |