diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-14 20:25:47 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-14 20:25:47 +0000 |
| commit | 00767aa4e344e5f1f774d3564d520b36f63d0cdf (patch) | |
| tree | 1abf89e482fe9e1e1563da922821733a1f680ce2 | |
| parent | da8c9887459f53401ff575ad49de54c05963cb2c (diff) | |
| parent | 08d989821d17c1a12d574e52e14fe9bd2d4a9e72 (diff) | |
| download | gitlab-ci-00767aa4e344e5f1f774d3564d520b36f63d0cdf.tar.gz | |
Merge branch 'pagination_bug' into 'master'
Add order option to projects API call
https://dev.gitlab.org/gitlab/gitlab-ci/issues/222
See merge request !101
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -12,6 +12,7 @@ v7.11.0 - Improve Email templates - Add backup/restore utility - Coordinator stores information(version, platform, revision, etc.) about runners. + - Fixed pagination on dashboard v7.10.1 - Fix failing migration when update to 7.10 from 7.8 and older versions diff --git a/app/models/user.rb b/app/models/user.rb index 4a1fd9b..471e124 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -10,7 +10,7 @@ class User def gitlab_projects(search = nil, page = 1, per_page = 100) Rails.cache.fetch(cache_key(page, per_page, search)) do - Project.from_gitlab(self, :authorized, { page: page, per_page: per_page, search: search }) + Project.from_gitlab(self, :authorized, { page: page, per_page: per_page, search: search, ci_enabled_first: true }) end end |