Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-03-20 23:30:08 +0300
committerDouwe Maan <douwe@selenight.nl>2016-03-20 23:30:08 +0300
commit3058a8fa4c1dfdf50a6f274bfbf280f8d2137168 (patch)
tree8e0ac2d83bbb4bf8f6727c3230c8dc0d59aa61a8 /app/controllers/groups_controller.rb
parentfd8d44ca6188b2ad9d6931ce385e61217724a712 (diff)
Fix "Shared projects" tab
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 48565f44ffb..87efb0a8970 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -44,7 +44,7 @@ class GroupsController < Groups::ApplicationController
@projects = @projects.sort(@sort = params[:sort])
@projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
- @shared_projects = GroupProjectsFinder.new(group, shared: true).execute(current_user)
+ @shared_projects = GroupProjectsFinder.new(group, only_shared: true).execute(current_user)
respond_to do |format|
format.html
@@ -77,7 +77,7 @@ class GroupsController < Groups::ApplicationController
end
def projects
- @projects = @projects.sorted_by_activity.page(params[:page])
+ @projects = @group.projects.page(params[:page])
end
def update