diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-21 15:36:08 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-21 15:36:08 +0100 |
| commit | 5ef2048f65da62999732876ea7efa00bc942ba78 (patch) | |
| tree | 9f3ee67a6ec66871ac95b74310ab0c711b7fcb84 | |
| parent | 4b4cbf0ce4925e22a635e4432e7ac8602199fa5b (diff) | |
| download | gitlab-ce-fix-issue-related-mrs.tar.gz | |
Fix issue related cross-project MRsfix-issue-related-mrs
| -rw-r--r-- | app/models/concerns/participable.rb | 2 | ||||
| -rw-r--r-- | app/models/issue.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb index 808d80b0530..fc6f83b918b 100644 --- a/app/models/concerns/participable.rb +++ b/app/models/concerns/participable.rb @@ -37,7 +37,7 @@ module Participable # Be aware that this method makes a lot of sql queries. # Save result into variable if you are going to reuse it inside same request - def participants(current_user = self.author, load_lazy_references: true) + def participants(current_user = self.author) participants = Gitlab::ReferenceExtractor.lazily do self.class.participant_attrs.flat_map do |attr| 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 |