summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-06 19:23:14 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-06 19:23:14 +0000
commitc4d4481f4c66797434dca6426393e770c9d5785e (patch)
tree90add1c180415f1a91b0a3404049272d80028865
parent9ff75e6a6f7ada371fb1c0905a6e5b24d41504e4 (diff)
parent8634d0d5c1a8c7c1dc0aa735bb7bd450ca6c9b86 (diff)
downloadgitlab-ce-c4d4481f4c66797434dca6426393e770c9d5785e.tar.gz
Merge branch 'fix-group-projects-sort' into 'master'
Sort projects by activity at group show page
-rw-r--r--app/controllers/groups_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index ebddf36de97..a3019b3ac78 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -100,7 +100,7 @@ class GroupsController < ApplicationController
end
def projects
- @projects ||= ProjectsFinder.new.execute(current_user, group: group)
+ @projects ||= ProjectsFinder.new.execute(current_user, group: group).sorted_by_activity.non_archived
end
def project_ids