diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2015-12-23 17:05:29 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2015-12-23 17:05:29 -0500 |
| commit | b3e4bc5911737db82f2b296a0eed7fcb59fa28bb (patch) | |
| tree | 948797dd0033eb26b2930b1db1608cdfdf4ca42d /app/models/issue.rb | |
| parent | 7e43fa67096f60856d1cf862f245367bc710a44f (diff) | |
| parent | 1100eb0c4e319518c3878bba4ac16cf344168ca6 (diff) | |
| download | gitlab-ce-b3e4bc5911737db82f2b296a0eed7fcb59fa28bb.tar.gz | |
resolves conflicts with new buttons
Diffstat (limited to 'app/models/issue.rb')
| -rw-r--r-- | app/models/issue.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 4571d7f0ee1..80ecd15077f 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -86,7 +86,7 @@ class Issue < ActiveRecord::Base def referenced_merge_requests Gitlab::ReferenceExtractor.lazily do [self, *notes].flat_map do |note| - note.all_references(load_lazy_references: false).merge_requests + note.all_references.merge_requests end end.sort_by(&:iid) end |