diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-23 18:01:30 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-23 18:01:30 +0300 |
| commit | ad70fb7bdc7a95f99267e88335b2241d6c9feff0 (patch) | |
| tree | b263071adc3e21aa99c26001c8279115285e04a8 /app/controllers/concerns | |
| parent | 038f5a412d0085f2d9610c77cea37cec75572b27 (diff) | |
| parent | 991bf24ec8890eca248a00deb4f33f309c9ffb83 (diff) | |
Merge branch 'use-merge-requests-diff-id-column' into 'master'
Use foreign key to get latest MR diff
Closes #37631
See merge request gitlab-org/gitlab-ce!15126
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 2b011bc87b0..f3c9251225f 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -150,7 +150,7 @@ module IssuableCollections when 'MergeRequest' [ :source_project, :target_project, :author, :assignee, :labels, :milestone, - head_pipeline: :project, target_project: :namespace, merge_request_diff: :merge_request_diff_commits + head_pipeline: :project, target_project: :namespace, latest_merge_request_diff: :merge_request_diff_commits ] end end |