diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /lib/sidebars | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
download | gitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'lib/sidebars')
-rw-r--r-- | lib/sidebars/groups/menus/customer_relations_menu.rb | 4 | ||||
-rw-r--r-- | lib/sidebars/projects/menus/settings_menu.rb | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/sidebars/groups/menus/customer_relations_menu.rb b/lib/sidebars/groups/menus/customer_relations_menu.rb index 0aaa6ec45f1..e0772cfe403 100644 --- a/lib/sidebars/groups/menus/customer_relations_menu.rb +++ b/lib/sidebars/groups/menus/customer_relations_menu.rb @@ -35,7 +35,7 @@ module Sidebars ::Sidebars::MenuItem.new( title: _('Contacts'), link: group_crm_contacts_path(context.group), - active_routes: { path: 'groups/crm#contacts' }, + active_routes: { controller: 'groups/crm/contacts' }, item_id: :crm_contacts ) end @@ -44,7 +44,7 @@ module Sidebars ::Sidebars::MenuItem.new( title: _('Organizations'), link: group_crm_organizations_path(context.group), - active_routes: { path: 'groups/crm#organizations' }, + active_routes: { controller: 'groups/crm/organizations' }, item_id: :crm_organizations ) end diff --git a/lib/sidebars/projects/menus/settings_menu.rb b/lib/sidebars/projects/menus/settings_menu.rb index 2b5b3cdbb22..85931e63ebc 100644 --- a/lib/sidebars/projects/menus/settings_menu.rb +++ b/lib/sidebars/projects/menus/settings_menu.rb @@ -54,7 +54,7 @@ module Sidebars ::Sidebars::MenuItem.new( title: _('Integrations'), link: project_settings_integrations_path(context.project), - active_routes: { path: %w[integrations#show services#edit] }, + active_routes: { path: %w[integrations#index integrations#edit] }, item_id: :integrations ) end @@ -104,15 +104,14 @@ module Sidebars end def packages_and_registries_menu_item - if !Gitlab.config.registry.enabled || - !can?(context.current_user, :destroy_container_image, context.project) + unless can?(context.current_user, :view_package_registry_project_settings, context.project) return ::Sidebars::NilMenuItem.new(item_id: :packages_and_registries) end ::Sidebars::MenuItem.new( title: _('Packages & Registries'), link: project_settings_packages_and_registries_path(context.project), - active_routes: { path: 'packages_and_registries#index' }, + active_routes: { path: 'packages_and_registries#show' }, item_id: :packages_and_registries ) end |