Merge remote-tracking branch 'origin/sort-starred-projects'

2016-03-04 14:24:22 +01:00 · 2016-03-04 14:24:22 +01:00 · d6f26e41db
parent b763c65eff afe9a07a9e
commit d6f26e41db
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -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
--- 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])