summaryrefslogtreecommitdiff
path: root/app/views/admin/users/_head.html.haml
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-01-19 15:31:04 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-01-19 15:31:04 +0100
commit8171a1932b3c5e55ad3ea8402ac68ff14692ca32 (patch)
treecdcef619d3df923e634bd61228179d80e88c61f6 /app/views/admin/users/_head.html.haml
parent8c9a4ed373f4b517aeae669e64023dc52c8d704a (diff)
parent1cc6d206b5d4cf09bb502a254703f3a2de2dbeb7 (diff)
downloadgitlab-ce-8171a1932b3c5e55ad3ea8402ac68ff14692ca32.tar.gz
Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build
Diffstat (limited to 'app/views/admin/users/_head.html.haml')
-rw-r--r--app/views/admin/users/_head.html.haml4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml
index ce5e21e54cc..9984e733956 100644
--- a/app/views/admin/users/_head.html.haml
+++ b/app/views/admin/users/_head.html.haml
@@ -15,10 +15,8 @@
%ul.nav-links
= nav_link(path: 'users#show') do
= link_to "Account", admin_user_path(@user)
- = nav_link(path: 'users#groups') do
- = link_to "Groups", groups_admin_user_path(@user)
= nav_link(path: 'users#projects') do
- = link_to "Projects", projects_admin_user_path(@user)
+ = link_to "Groups and projects", projects_admin_user_path(@user)
= nav_link(path: 'users#keys') do
= link_to "SSH keys", keys_admin_user_path(@user)
= nav_link(controller: :identities) do