diff options
| author | Ted Hogan <ted.hogan17@gmail.com> | 2015-12-29 11:25:46 -0700 |
|---|---|---|
| committer | Ted Hogan <ted.hogan17@gmail.com> | 2015-12-29 11:25:46 -0700 |
| commit | 9fc6df512b53ff0e589bc6be7932da8ecfec4033 (patch) | |
| tree | 6d356b79b323c2efb7c4d2c92aff2cdfd7c17358 /lib/api/helpers.rb | |
| parent | 6e6a99061dbec4bb45a398a03e8a13a084e44035 (diff) | |
| parent | eeba266e3d45f2e82f84bd3aab85195c890efb89 (diff) | |
| download | gitlab-ce-9fc6df512b53ff0e589bc6be7932da8ecfec4033.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacing
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 |