summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-14 20:08:02 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-14 20:08:02 +0100
commit88f8d3a4d6521d1001bcea83c2fb7b7c4fe15f37 (patch)
tree6396220c786e65563c8d0eb4dc1a88a60d3636c8 /app/views/admin
parent76eeb316df2f256d0d3c41d97421f709a21a02a8 (diff)
parentb782e7c9732275175d79b485fcddc85e575d48dd (diff)
downloadgitlab-ce-88f8d3a4d6521d1001bcea83c2fb7b7c4fe15f37.tar.gz
Merge branch 'master' into 4009-external-users
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/groups/show.html.haml16
1 files changed, 16 insertions, 0 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index f7fd156b84a..264fa1bf0cd 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -50,6 +50,22 @@
.panel-footer
= paginate @projects, param_name: 'projects_page', theme: 'gitlab'
+ - if @group.shared_projects.any?
+ .panel.panel-default
+ .panel-heading
+ Projects shared with #{@group.name}
+ %span.badge
+ #{@group.shared_projects.count}
+ %ul.well-list
+ - @group.shared_projects.sort_by(&:name).each do |project|
+ %li
+ %strong
+ = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project]
+ %span.label.label-gray
+ = repository_size(project)
+ %span.pull-right.light
+ %span.monospace= project.path_with_namespace + ".git"
+
.col-md-6
- if can?(current_user, :admin_group_member, @group)
.panel.panel-default