diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-05 06:12:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-05 06:12:53 +0000 |
| commit | 6d706d5dc036fb40f4d7b8e6619c3c78335620aa (patch) | |
| tree | d29a01e9e54b831bc97d8defe122c3eaf8038551 /lib/sidebars | |
| parent | ee231234eb70b3a40d95c4874c6d6d1b2ca0a39d (diff) | |
| download | gitlab-ce-6d706d5dc036fb40f4d7b8e6619c3c78335620aa.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/sidebars')
| -rw-r--r-- | lib/sidebars/projects/panel.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb index 1af8e14f034..8ae8f931aab 100644 --- a/lib/sidebars/projects/panel.rb +++ b/lib/sidebars/projects/panel.rb @@ -51,8 +51,7 @@ module Sidebars end def third_party_wiki_menu - wiki_menu_list = [::Sidebars::Projects::Menus::ConfluenceMenu] - wiki_menu_list << ::Sidebars::Projects::Menus::ShimoMenu if Feature.enabled?(:shimo_integration, context.project) + wiki_menu_list = [::Sidebars::Projects::Menus::ConfluenceMenu, ::Sidebars::Projects::Menus::ShimoMenu] wiki_menu_list.find { |wiki_menu| wiki_menu.new(context).render? } end |