diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-12-15 16:24:14 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-12-15 16:24:14 +0100 |
| commit | d27befe64dd0d55bec2472ef641c4733cc669215 (patch) | |
| tree | 623db3d658408b42d8b25e923eb9ccf68016d9fa /lib/api/helpers.rb | |
| parent | 447e598ec4ee0d2fae29303d4359ffe6a06d3ba5 (diff) | |
| parent | 4493d3fd556af6ded47f940f258b0fc26c9eb3e8 (diff) | |
| download | gitlab-ce-d27befe64dd0d55bec2472ef641c4733cc669215.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passthrough
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 92540ccf2b1..a4df810e755 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -266,12 +266,7 @@ module API projects = projects.search(params[:search]) end - if params[:ci_enabled_first].present? - projects.includes(:gitlab_ci_service). - reorder("services.active DESC, projects.#{project_order_by} #{project_sort}") - else - projects.reorder(project_order_by => project_sort) - end + projects.reorder(project_order_by => project_sort) end def project_order_by |