diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-29 06:08:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-29 06:08:22 +0300 |
commit | f26311e23466947e3b57914341866aa440e67267 (patch) | |
tree | 5e23f61d79bfb8ef6b8fb745f46d21401b141c04 /app/views/layouts/nav/sidebar | |
parent | 2c99b3e0f38bd94ace525f35469dae1eda051c16 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/nav/sidebar')
-rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 9bac0f04d23..94c708783e4 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -269,11 +269,10 @@ = link_to metrics_and_profiling_admin_application_settings_path, title: _('Metrics and profiling'), class: 'qa-admin-settings-metrics-and-profiling-item' do %span = _('Metrics and profiling') - - if Feature.enabled?(:admin_application_settings_service_usage_data_center, default_enabled: :yaml) - = nav_link(path: ['application_settings#service_usage_data']) do - = link_to service_usage_data_admin_application_settings_path, title: _('Service usage data') do - %span - = _('Service usage data') + = nav_link(path: ['application_settings#service_usage_data']) do + = link_to service_usage_data_admin_application_settings_path, title: _('Service usage data') do + %span + = _('Service usage data') = nav_link(path: 'application_settings#network') do = link_to network_admin_application_settings_path, title: _('Network'), data: { qa_selector: 'admin_settings_network_item' } do %span |