diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-18 09:35:18 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-18 09:35:18 +0000 |
| commit | 00aebc73ebba79a5291d9ff26d628c5bd6010a90 (patch) | |
| tree | 751ca8f9e1d8cf084933bbd39768aef4dacf4855 | |
| parent | 8e7d4d947542cf74505cf29c087e9f57d2c163d8 (diff) | |
| parent | ea0e7dc5c0cacd32d3329718ea71e7e5a867e0f4 (diff) | |
| download | gitlab-ce-00aebc73ebba79a5291d9ff26d628c5bd6010a90.tar.gz | |
Merge branch 'change-generating-url-functions' into 'master'
change generating url functions for external url
See merge request gitlab-org/gitlab-ce!22389
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/projects/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 0c683f86252..21c1260e982 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -119,7 +119,7 @@ = _("<strong>%{group_name}</strong> group members").html_safe % { group_name: @group.name } %span.badge.badge-pill= @group.members.size .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 = render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false } .card-footer diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index fefb4c7455d..03cce4745aa 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -183,7 +183,7 @@ project members %span.badge.badge-pill= @project.users.size .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 = render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false } .card-footer |