Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-18 12:27:31 +0300
committerJarka Kadlecova <jarka@gitlab.com>2017-09-19 09:50:07 +0300
commit6e8a242a52a24e980e398d048c8886c8b5545a0a (patch)
treefa971f8b60667a4ebd3be1a8ffb7ede1ca5d1423
parenta0673b38bc05e795a8dd647239288e13d0ea9d10 (diff)
Merge branch '37957-fix-groups-members-flyout-link' into 'master'
Use correct group members path for members flyout link Closes #37957 See merge request gitlab-org/gitlab-ce!14329
-rw-r--r--app/views/layouts/nav/sidebar/_group.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml
index e01dfa7c854..25f3955c492 100644
--- a/app/views/layouts/nav/sidebar/_group.html.haml
+++ b/app/views/layouts/nav/sidebar/_group.html.haml
@@ -84,7 +84,7 @@
Members
%ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(path: 'group_members#index', html_options: { class: "fly-out-top-item" } ) do
- = link_to merge_requests_group_path(@group) do
+ = link_to group_group_members_path(@group) do
%strong.fly-out-top-item-name
#{ _('Members') }
- if current_user && can?(current_user, :admin_group, @group)