提交 58ca8490 编写于 作者: R Robert Speicher

Merge branch 'fix-group-projects-sort' into 'master'

Projects on group page should be sorted by last activity instead of id/created_at
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #15237 

See merge request !3716
......@@ -40,6 +40,7 @@ class GroupsController < Groups::ApplicationController
@last_push = current_user.recent_push if current_user
@projects = @projects.includes(:namespace)
@projects = @projects.sorted_by_activity
@projects = filter_projects(@projects)
@projects = @projects.sort(@sort = params[:sort])
@projects = @projects.page(params[:page]) if params[:filter_projects].blank?
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册