diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-07 16:15:32 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-07 16:15:32 +0000 |
| commit | 523a1c69ab6c51969f2613c4042d91318f841081 (patch) | |
| tree | a30cd8e62725a818a9d0e4bfa6405fe194fdc3d6 /lib/api | |
| parent | ec304cb9297ae75a7f46d6945d537c5d1cbd2fdf (diff) | |
| parent | cfd475a45ee2655fa0148b0b561f95b44fe8641b (diff) | |
| download | gitlab-ce-523a1c69ab6c51969f2613c4042d91318f841081.tar.gz | |
Merge branch '23079-remove-default-scope-in-sortable' into 'master'
Removes default scope from sortable
Closes #23079
See merge request !13558
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/broadcast_messages.rb | 2 | ||||
| -rw-r--r-- | lib/api/merge_request_diffs.rb | 2 | ||||
| -rw-r--r-- | lib/api/milestone_responses.rb | 2 | ||||
| -rw-r--r-- | lib/api/v3/merge_request_diffs.rb | 2 | ||||
| -rw-r--r-- | lib/api/v3/milestones.rb | 1 | ||||
| -rw-r--r-- | lib/api/v3/projects.rb | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/lib/api/broadcast_messages.rb b/lib/api/broadcast_messages.rb index 0b45621ce7b..d7138b2f2fe 100644 --- a/lib/api/broadcast_messages.rb +++ b/lib/api/broadcast_messages.rb @@ -20,7 +20,7 @@ module API use :pagination end get do - messages = BroadcastMessage.all + messages = BroadcastMessage.all.order_id_desc present paginate(messages), with: Entities::BroadcastMessage end diff --git a/lib/api/merge_request_diffs.rb b/lib/api/merge_request_diffs.rb index c3affcc6c6b..95ef8f42954 100644 --- a/lib/api/merge_request_diffs.rb +++ b/lib/api/merge_request_diffs.rb @@ -21,7 +21,7 @@ module API get ":id/merge_requests/:merge_request_iid/versions" do merge_request = find_merge_request_with_access(params[:merge_request_iid]) - present paginate(merge_request.merge_request_diffs), with: Entities::MergeRequestDiff + present paginate(merge_request.merge_request_diffs.order_id_desc), with: Entities::MergeRequestDiff end desc 'Get a single merge request diff version' do diff --git a/lib/api/milestone_responses.rb b/lib/api/milestone_responses.rb index ef09d9505d2..c570eace862 100644 --- a/lib/api/milestone_responses.rb +++ b/lib/api/milestone_responses.rb @@ -28,7 +28,7 @@ module API end def list_milestones_for(parent) - milestones = parent.milestones + milestones = parent.milestones.order_id_desc milestones = Milestone.filter_by_state(milestones, params[:state]) milestones = filter_by_iid(milestones, params[:iids]) if params[:iids].present? milestones = filter_by_search(milestones, params[:search]) if params[:search] diff --git a/lib/api/v3/merge_request_diffs.rb b/lib/api/v3/merge_request_diffs.rb index 35f462e907b..22866fc2845 100644 --- a/lib/api/v3/merge_request_diffs.rb +++ b/lib/api/v3/merge_request_diffs.rb @@ -20,7 +20,7 @@ module API get ":id/merge_requests/:merge_request_id/versions" do merge_request = find_merge_request_with_access(params[:merge_request_id]) - present merge_request.merge_request_diffs, with: ::API::Entities::MergeRequestDiff + present merge_request.merge_request_diffs.order_id_desc, with: ::API::Entities::MergeRequestDiff end desc 'Get a single merge request diff version' do diff --git a/lib/api/v3/milestones.rb b/lib/api/v3/milestones.rb index 4c7061d4939..9be4cf9d22a 100644 --- a/lib/api/v3/milestones.rb +++ b/lib/api/v3/milestones.rb @@ -34,6 +34,7 @@ module API milestones = user_project.milestones milestones = filter_milestones_state(milestones, params[:state]) milestones = filter_by_iid(milestones, params[:iid]) if params[:iid].present? + milestones = milestones.order_id_desc present paginate(milestones), with: ::API::Entities::Milestone end diff --git a/lib/api/v3/projects.rb b/lib/api/v3/projects.rb index 74df246bdfe..7c260b8d910 100644 --- a/lib/api/v3/projects.rb +++ b/lib/api/v3/projects.rb @@ -120,7 +120,7 @@ module API get do authenticate! - present_projects current_user.authorized_projects, + present_projects current_user.authorized_projects.order_id_desc, with: ::API::V3::Entities::ProjectWithAccess end |