diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-07 19:15:32 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-07 19:15:32 +0300 |
| commit | 523a1c69ab6c51969f2613c4042d91318f841081 (patch) | |
| tree | a30cd8e62725a818a9d0e4bfa6405fe194fdc3d6 /app/controllers/projects/merge_requests | |
| parent | ec304cb9297ae75a7f46d6945d537c5d1cbd2fdf (diff) | |
| parent | cfd475a45ee2655fa0148b0b561f95b44fe8641b (diff) | |
Merge branch '23079-remove-default-scope-in-sortable' into 'master'
Removes default scope from sortable
Closes #23079
See merge request !13558
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 109418c73f7..d60a24d3f1d 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 + @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff.order_id_desc @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id } if params[:start_sha].present? |