diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-04 14:24:22 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-04 14:24:22 +0100 |
| commit | d6f26e41dbf06ae9066d2b76147a361e6dee0015 (patch) | |
| tree | 02aa16fa524c08e80b67854f39eed7e4e2cb86d7 | |
| parent | b763c65eff0412051b29d7ea3290b1a12d575c53 (diff) | |
| parent | afe9a07a9ebed594e1d6d01474d434760a633a02 (diff) | |
| download | gitlab-ce-d6f26e41dbf06ae9066d2b76147a361e6dee0015.tar.gz | |
Merge remote-tracking branch 'origin/sort-starred-projects'
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1dc6f6f6874..093d76ac19d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,7 @@ v 8.5.4 (unreleased) v 8.5.3 - Flush repository caches before renaming projects + - Sort starred projects on dashboard based on last activity by default v 8.5.2 - Fix sidebar overlapping content when screen width was below 1200px diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index aeafbd30143..dc880b634e5 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -31,7 +31,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController end def starred - @projects = current_user.starred_projects + @projects = current_user.starred_projects.sorted_by_activity @projects = @projects.includes(:namespace, :forked_from_project, :tags) @projects = @projects.sort(@sort = params[:sort]) |