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:
Diffstat (limited to 'lib/sidebars/projects/menus/settings_menu.rb')
-rw-r--r--lib/sidebars/projects/menus/settings_menu.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/sidebars/projects/menus/settings_menu.rb b/lib/sidebars/projects/menus/settings_menu.rb
index eea32d8b626..9ed142f7f60 100644
--- a/lib/sidebars/projects/menus/settings_menu.rb
+++ b/lib/sidebars/projects/menus/settings_menu.rb
@@ -44,6 +44,16 @@ module Sidebars
'settings'
end
+ override :pick_into_super_sidebar?
+ def pick_into_super_sidebar?
+ true
+ end
+
+ override :separated?
+ def separated?
+ true
+ end
+
private
def general_menu_item
@@ -163,7 +173,7 @@ module Sidebars
title: _('Merge requests'),
link: project_settings_merge_requests_path(context.project),
active_routes: { path: 'projects/settings/merge_requests#show' },
- item_id: :merge_requests
+ item_id: context.is_super_sidebar ? :merge_request_settings : :merge_requests
)
end
end