diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-07-07 15:54:39 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-07-07 15:54:39 +0100 |
| commit | b8c4d5e0f552dc9986883bd9c8783c7f43f125ce (patch) | |
| tree | 06478887ace997e9b5735f797ddd64b7f028dc6d /app/controllers/concerns | |
| parent | 97611c88fcbae6b025750e6ebf2061a3d87d9753 (diff) | |
| parent | c88739ffa6ad99fbd5e20a6e8f2ee251996ea18b (diff) | |
| download | gitlab-ce-b8c4d5e0f552dc9986883bd9c8783c7f43f125ce.tar.gz | |
Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-group
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/issuable_collections.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb index 650ec1e326a..693e2f6365c 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -47,7 +47,7 @@ module IssuableCollections end def merge_requests_collection - merge_requests_finder.execute.preload(:source_project, :target_project, :author, :assignee, :labels, :milestone, :merge_request_diff, :head_pipeline, target_project: :namespace) + merge_requests_finder.execute.preload(:source_project, :target_project, :author, :assignee, :labels, :milestone, :head_pipeline, target_project: :namespace, merge_request_diff: :merge_request_diff_commits) end def issues_finder |