summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-26 12:51:48 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-26 14:19:42 +0200
commit10de4e3bb612a529480c93da53849d95e98a8633 (patch)
treec2aaa48b506a8e9318f504f57aad9fc43aabc251 /app/views/groups
parent9410f215eab0ba49051d2a00f0b4174f5dc13a6f (diff)
downloadgitlab-ce-10de4e3bb612a529480c93da53849d95e98a8633.tar.gz
Show nested groups tab on group page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/show.html.haml10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 52ce26a20b1..a3cd333373e 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -32,6 +32,10 @@
%li
= link_to "#shared", 'data-toggle' => 'tab' do
Shared Projects
+ - if @nested_groups.present?
+ %li
+ = link_to "#groups", 'data-toggle' => 'tab' do
+ Nested Groups
.nav-controls
= form_tag request.path, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false
@@ -47,3 +51,9 @@
- if @shared_projects.present?
.tab-pane#shared
= render "shared_projects", projects: @shared_projects
+
+ - if @nested_groups.present?
+ .tab-pane#groups
+ %ul.content-list
+ - @nested_groups.each do |group|
+ = render 'shared/groups/group', group: group