Commit 0b3dc602 authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '344329-make-badges-in-app-views-admin-projects-show-html-haml-pajamas-compliant' into 'master'

Use rails helper for badges on admin projects show page

See merge request gitlab-org/gitlab!76775
parents e5dd7a3c 7503810f
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
.card-header .card-header
%strong= @group.name %strong= @group.name
= _('group members') = _('group members')
%span.badge.badge-pill= @group_members.size = gl_badge_tag @group_members.size
= render 'shared/members/manage_access_button', path: group_group_members_path(@group) = render 'shared/members/manage_access_button', path: group_group_members_path(@group)
%ul.content-list.members-list %ul.content-list.members-list
= render partial: 'shared/members/member', = render partial: 'shared/members/member',
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
.card-header .card-header
%strong= @project.name %strong= @project.name
= _('project members') = _('project members')
%span.badge.badge-pill= @project.users.size = gl_badge_tag @project.users.size
= render 'shared/members/manage_access_button', path: project_project_members_path(@project) = render 'shared/members/manage_access_button', path: project_project_members_path(@project)
%ul.content-list.project_members.members-list %ul.content-list.project_members.members-list
= render partial: 'shared/members/member', = render partial: 'shared/members/member',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment