summaryrefslogtreecommitdiff
path: root/app/controllers/groups_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-29 18:51:29 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-29 18:51:29 +0000
commit23fc1f666cf62b21485b216bbd86a10637a98d6c (patch)
tree7e3fef4337ea45ec79421db93648e11a7d76e288 /app/controllers/groups_controller.rb
parent714f70a38df10e678bffde6e6081a97e31d8317c (diff)
parent283e868ef523185b0ee314b9e2164599780d888b (diff)
downloadgitlab-ce-23fc1f666cf62b21485b216bbd86a10637a98d6c.tar.gz
Merge branch 'dz-nested-group-misc' into 'master'
Miscellaneous improvements to the nested groups feature See merge request !8308
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 01c8fa2739f..b61f4e9a2db 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -42,6 +42,8 @@ class GroupsController < Groups::ApplicationController
@notification_setting = current_user.notification_settings_for(group)
end
+ @nested_groups = group.children
+
setup_projects
respond_to do |format|