diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-03 15:58:00 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-03 15:58:00 +0100 |
| commit | 617bb1096deb1fb5dea66d04b9bbd7da0dfb57ba (patch) | |
| tree | e11da6f2a695b3cc8c8875e60da5142d38946f6f | |
| parent | 70d6455284717f938016b1e1b569e0d0dadb11fc (diff) | |
| download | gitlab-ce-617bb1096deb1fb5dea66d04b9bbd7da0dfb57ba.tar.gz | |
Revert "Sort starred projects on dashboard based on last activity by default"
This reverts commit 70d6455284717f938016b1e1b569e0d0dadb11fc.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7e99a39ccec..69a1927b765 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,7 +11,6 @@ v 8.6.0 (unreleased) - Update documentation to reflect Guest role not being enforced on internal projects - Allow search for logged out users - Don't show Issues/MRs from archived projects in Groups view - - 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 dc880b634e5..aeafbd30143 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.sorted_by_activity + @projects = current_user.starred_projects @projects = @projects.includes(:namespace, :forked_from_project, :tags) @projects = @projects.sort(@sort = params[:sort]) |