summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-10-19 08:02:01 +0000
committerPhil Hughes <me@iamphill.com>2017-10-19 08:02:01 +0000
commit65523e655f6c34e5ffa32a669f5e148e408345eb (patch)
tree0ac4fe6d224691b62127f549e2c0506c8a0aaf38 /app
parenteb389e988036099d0a846b0ef067e8fb5dcba813 (diff)
parent76e7246982484f7886f88bae89756c05f05658f9 (diff)
downloadgitlab-ce-65523e655f6c34e5ffa32a669f5e148e408345eb.tar.gz
Merge branch '38648-members-sidebar' into 'master'
Add members flyout on collapsed sidebar Closes #38648 See merge request gitlab-org/gitlab-ce!14942
Diffstat (limited to 'app')
-rw-r--r--app/views/layouts/nav/sidebar/_project.html.haml5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index 759d6ff68ea..f82207559a3 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -272,6 +272,11 @@
= sprite_icon('users')
%span.nav-item-name
Members
+ %ul.sidebar-sub-level-items.is-fly-out-only
+ = nav_link(path: %w[members#show], html_options: { class: "fly-out-top-item" } ) do
+ = link_to project_settings_members_path(@project) do
+ %strong.fly-out-top-item-name
+ #{ _('Members') }
= render 'shared/sidebar_toggle_button'