From e4ea43b2b85ad5f3115f00220601eb719705139a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 27 Jan 2020 21:08:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/finders/projects_finder.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/finders/projects_finder.rb') diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index ac18c17dc61..7cac8deea07 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -44,6 +44,8 @@ class ProjectsFinder < UnionFinder init_collection end + use_cte = params.delete(:use_cte) + collection = Project.wrap_authorized_projects_with_cte(collection) if use_cte collection = filter_projects(collection) sort(collection) end @@ -177,7 +179,7 @@ class ProjectsFinder < UnionFinder end def sort(items) - params[:sort].present? ? items.sort_by_attribute(params[:sort]) : items.order_id_desc + params[:sort].present? ? items.sort_by_attribute(params[:sort]) : items.projects_order_id_desc end def by_archived(projects) -- cgit v1.2.1