diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-11-29 16:33:06 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-11-29 16:33:06 +0300 |
| commit | 124fa93a8a36f3835d2fae3ef50b1b5403df153d (patch) | |
| tree | 04e737c6f9c691e1780be44dabce749723841f64 /app/controllers/projects/merge_requests | |
| parent | 552c90893059dc5a9a525d7ed79359542f70aad6 (diff) | |
| parent | 484ae2ee2db58a641d3c3fff36f46b431ce450df (diff) | |
Merge branch 'remove-mr-diff-serialised-columns' into 'master'
Remove serialised diff and commit columns
Closes #39533
See merge request gitlab-org/gitlab-ce!15582
Diffstat (limited to 'app/controllers/projects/merge_requests')
| -rw-r--r-- | app/controllers/projects/merge_requests/diffs_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb index d60a24d3f1d..9f966889995 100644 --- a/app/controllers/projects/merge_requests/diffs_controller.rb +++ b/app/controllers/projects/merge_requests/diffs_controller.rb @@ -27,7 +27,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic @merge_request.merge_request_diff end - @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff.order_id_desc + @merge_request_diffs = @merge_request.merge_request_diffs.viewable.order_id_desc @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id } if params[:start_sha].present? |