diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-14 20:25:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-14 20:25:39 +0000 |
| commit | 740dc412506f80699cb9f82930d948fa961c6c05 (patch) | |
| tree | a40e4f17c5db3b5edf27595310fcbae39398e3ae /lib | |
| parent | aa4f085184f24272eef48e1da23557459957fbe7 (diff) | |
| parent | 74710471046cc17163e5e0b3a6973d1f23c46bfa (diff) | |
| download | gitlab-ce-740dc412506f80699cb9f82930d948fa961c6c05.tar.gz | |
Merge branch 'project_api_order' into 'master'
Add order option for projects API
https://dev.gitlab.org/gitlab/gitlab-ci/issues/222
See merge request !656
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/projects.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index e3fff79d68f..1f2251c9b9c 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -22,7 +22,12 @@ module API projects = projects.search(params[:search]) end - projects.reorder(project_order_by => project_sort) + 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 end def project_order_by |