diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-08-15 11:27:37 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-09-07 13:01:59 +0100 |
| commit | cfd475a45ee2655fa0148b0b561f95b44fe8641b (patch) | |
| tree | 84bc8f20239d58ed19e35cb515c50d3b36735c4f /app/finders | |
| parent | d1b60cbc67dc14b21820ef3f823a8e1ea851697d (diff) | |
| download | gitlab-ce-cfd475a45ee2655fa0148b0b561f95b44fe8641b.tar.gz | |
Removes default scope from sortable23079-remove-default-scope-in-sortable
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/move_to_project_finder.rb | 1 | ||||
| -rw-r--r-- | app/finders/projects_finder.rb | 2 | ||||
| -rw-r--r-- | app/finders/todos_finder.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/finders/move_to_project_finder.rb b/app/finders/move_to_project_finder.rb index 79eb45568be..038d5565a1e 100644 --- a/app/finders/move_to_project_finder.rb +++ b/app/finders/move_to_project_finder.rb @@ -9,6 +9,7 @@ class MoveToProjectFinder projects = @user.projects_where_can_admin_issues projects = projects.search(search) if search.present? projects = projects.excluding_project(from_project) + projects = projects.order_id_desc # infinite scroll using offset projects = projects.where('projects.id < ?', offset_id) if offset_id.present? diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index fa6fea2588a..eac6095d8dc 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -121,7 +121,7 @@ class ProjectsFinder < UnionFinder end def sort(items) - params[:sort].present? ? items.sort(params[:sort]) : items + params[:sort].present? ? items.sort(params[:sort]) : items.order_id_desc end def by_archived(projects) diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb index b276116f0c6..3502bf08971 100644 --- a/app/finders/todos_finder.rb +++ b/app/finders/todos_finder.rb @@ -118,7 +118,7 @@ class TodosFinder end def sort(items) - params[:sort] ? items.sort(params[:sort]) : items.reorder(id: :desc) + params[:sort] ? items.sort(params[:sort]) : items.order_id_desc end def by_action(items) |