Merge branch 'remove-orphans' into 'master'
Remove orphaned haml files Closes #34779 See merge request !12690
This commit is contained in:
commit
dbb65c13f7
2 changed files with 0 additions and 42 deletions
|
@ -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)}
|
|
|
@ -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)}
|
|
Loading…
Reference in a new issue