Merge branch 'change-generating-url-functions' into 'master'
change generating url functions for external url See merge request gitlab-org/gitlab-ce!22389
This commit is contained in:
commit
00aebc73eb
|
@ -119,7 +119,7 @@
|
||||||
= _("<strong>%{group_name}</strong> group members").html_safe % { group_name: @group.name }
|
= _("<strong>%{group_name}</strong> group members").html_safe % { group_name: @group.name }
|
||||||
%span.badge.badge-pill= @group.members.size
|
%span.badge.badge-pill= @group.members.size
|
||||||
.float-right
|
.float-right
|
||||||
= link_to icon('pencil-square-o', text: _('Manage access')), polymorphic_url([@group, :members]), class: "btn btn-sm"
|
= link_to icon('pencil-square-o', text: _('Manage access')), group_group_members_path(@group), class: "btn btn-sm"
|
||||||
%ul.content-list.group-users-list.content-list.members-list
|
%ul.content-list.group-users-list.content-list.members-list
|
||||||
= render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
|
= render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
|
||||||
.card-footer
|
.card-footer
|
||||||
|
|
|
@ -183,7 +183,7 @@
|
||||||
project members
|
project members
|
||||||
%span.badge.badge-pill= @project.users.size
|
%span.badge.badge-pill= @project.users.size
|
||||||
.float-right
|
.float-right
|
||||||
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@project, :members]), class: "btn btn-sm"
|
= link_to icon('pencil-square-o', text: 'Manage access'), project_project_members_path(@project), class: "btn btn-sm"
|
||||||
%ul.content-list.project_members.members-list
|
%ul.content-list.project_members.members-list
|
||||||
= render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
|
= render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
|
||||||
.card-footer
|
.card-footer
|
||||||
|
|
Loading…
Reference in New Issue