diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-07-06 21:16:17 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-07-06 21:16:17 +0000 |
commit | dbb65c13f79cc5332f4d14437e95f0390c628c63 (patch) | |
tree | dd6d1d6d783160625c6db441526cdcd2cdc1099a | |
parent | c1144ec1f4dd6b80b4684705f489365348b90a93 (diff) | |
parent | 7cc8bf4e4b7a74d6955f7469934033316b146bf7 (diff) | |
download | gitlab-ce-34759-rogue.tar.gz |
Merge branch 'remove-orphans' into 'master'34759-rogue
Remove orphaned haml files
Closes #34779
See merge request !12690
-rw-r--r-- | app/views/projects/project_members/_group_members.html.haml | 18 | ||||
-rw-r--r-- | app/views/projects/project_members/_shared_group_members.html.haml | 24 |
2 files changed, 0 insertions, 42 deletions
diff --git a/app/views/projects/project_members/_group_members.html.haml b/app/views/projects/project_members/_group_members.html.haml deleted file mode 100644 index c7996077bc7..00000000000 --- a/app/views/projects/project_members/_group_members.html.haml +++ /dev/null @@ -1,18 +0,0 @@ -.panel.panel-default - .panel-heading - Group members with access to - %strong= @group.name - %span.badge= members.size - - if can?(current_user, :admin_group_member, @group) - .controls - = link_to 'Manage group members', - group_group_members_path(@group), - class: 'btn' - %ul.content-list - = render partial: 'shared/members/member', - collection: members.limit(20), - as: :member, - locals: { show_controls: false } - - if members.size > 20 - %li - and #{members.count - 20} more. For full list visit #{link_to 'group members page', group_group_members_path(@group)} diff --git a/app/views/projects/project_members/_shared_group_members.html.haml b/app/views/projects/project_members/_shared_group_members.html.haml deleted file mode 100644 index 7902ddb1ae9..00000000000 --- a/app/views/projects/project_members/_shared_group_members.html.haml +++ /dev/null @@ -1,24 +0,0 @@ -- @project_group_links.each do |group_links| - - shared_group = group_links.group - - shared_group_members = shared_group.members - - shared_group_users_count = shared_group_members.size - .panel.panel-default - .panel-heading - Shared with - %strong= shared_group.name - group, members with - %strong= group_links.human_access - role (#{shared_group_users_count}) - - if can?(current_user, :admin_group, shared_group) - .panel-head-actions - = link_to group_group_members_path(shared_group), class: 'btn btn-sm' do - %i.fa.fa-pencil-square-o - Edit group members - %ul.content-list - = render partial: 'shared/members/member', - collection: shared_group_members.order(access_level: :desc).limit(20), - as: :member, - locals: { show_controls: false, show_roles: false } - - if shared_group_users_count > 20 - %li - and #{shared_group_users_count - 20} more. For full list visit #{link_to 'group members page', group_group_members_path(shared_group)} |