summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2019-03-22 17:43:38 +1100
committerSimon Knox <psimyn@gmail.com>2019-03-22 17:43:38 +1100
commit3c52adbeaf3409f6d362ccd96c277aac65b10d94 (patch)
tree608849253cae2881c0e8715eb4734dca43b1f7dd
parent21a8079a01b791aab6f152753ad7078a6b2fd65c (diff)
downloadgitlab-ce-operations-nav-icon-ee.tar.gz
Hide Operations icon when More dropdown visibleoperations-nav-icon-ee
-rw-r--r--app/views/layouts/nav/_dashboard.html.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 5a27237bf76..f1571bd3ae5 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -81,17 +81,17 @@
= link_to '#', class: 'dashboard-shortcuts-web-ide', title: _('Web IDE') do
= _('Web IDE')
- = render_if_exists 'dashboard/operations/nav_link'
+ = render_if_exists 'dashboard/operations/nav_link_icon'
- if can?(current_user, :read_instance_statistics)
- = nav_link(controller: [:conversational_development_index, :cohorts], html_options: { class: "d-none d-lg-block d-xl-block"}) do
+ = nav_link(controller: [:conversational_development_index, :cohorts], html_options: { class: "d-none d-xl-block"}) do
= link_to instance_statistics_root_path, title: _('Instance Statistics'), aria: { label: _('Instance Statistics') }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('chart', size: 18)
- if current_user.admin?
- = nav_link(controller: 'admin/dashboard', html_options: { class: "d-none d-lg-block d-xl-block"}) do
+ = nav_link(controller: 'admin/dashboard', html_options: { class: "d-none d-xl-block"}) do
= link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: _('Admin Area'), aria: { label: _('Admin Area') }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('admin', size: 18)
- if Gitlab::Sherlock.enabled?
%li
- = link_to sherlock_transactions_path, class: 'admin-icon d-none d-lg-block d-xl-block', title: _('Sherlock Transactions'),
+ = link_to sherlock_transactions_path, class: 'admin-icon d-none d-xl-block', title: _('Sherlock Transactions'),
data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('tachometer fw')