summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-03 15:56:29 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-03 15:56:29 +0100
commit70d6455284717f938016b1e1b569e0d0dadb11fc (patch)
treee40606b16d5da2af85dc2ebdc559fbdf82f4a3bf
parent11b6aeafbafa221f34a555b8c862a1de3eb87aed (diff)
downloadgitlab-ce-70d6455284717f938016b1e1b569e0d0dadb11fc.tar.gz
Sort starred projects on dashboard based on last activity by default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--CHANGELOG1
-rw-r--r--app/controllers/dashboard/projects_controller.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 69a1927b765..7e99a39ccec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ 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 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])