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:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-09-04 21:01:58 +0300
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-04 23:46:49 +0300
commit2eac1537ad907f2f7e628788cf980cb7e48d3f56 (patch)
treeab22cb6965bbf1bf111cb9a8788524ac392f7f03 /app/controllers/groups_controller.rb
parentca538899b66a6a82582d2d590297cfef1d310dcf (diff)
Fetch children using new finder for the `show` of a group.
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 3769a2cde33..588995ab5a8 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -45,18 +45,15 @@ class GroupsController < Groups::ApplicationController
end
def show
- setup_projects
+ @children = GroupChildrenFinder.new(current_user, parent_group: @group, params: params).execute
+
+ @children = @children.page(params[:page])
respond_to do |format|
format.html
- format.json do
- render json: {
- html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
- }
- end
-
format.atom do
+ setup_projects
load_events
render layout: 'xml.atom'
end