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/panel.rb')
-rw-r--r--lib/sidebars/projects/panel.rb15
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb
index 8fbd71c1543..6bb4fb52e2a 100644
--- a/lib/sidebars/projects/panel.rb
+++ b/lib/sidebars/projects/panel.rb
@@ -32,8 +32,7 @@ module Sidebars
add_menu(Sidebars::Projects::Menus::InfrastructureMenu.new(context))
add_menu(Sidebars::Projects::Menus::PackagesRegistriesMenu.new(context))
add_menu(Sidebars::Projects::Menus::AnalyticsMenu.new(context))
- add_menu(confluence_or_wiki_menu)
- add_menu(Sidebars::Projects::Menus::ExternalWikiMenu.new(context))
+ add_wiki_menus
add_menu(Sidebars::Projects::Menus::SnippetsMenu.new(context))
add_menu(Sidebars::Projects::Menus::SettingsMenu.new(context))
add_invite_members_menu
@@ -46,10 +45,16 @@ module Sidebars
end
end
- def confluence_or_wiki_menu
- confluence_menu = ::Sidebars::Projects::Menus::ConfluenceMenu.new(context)
+ def add_wiki_menus
+ add_menu((third_party_wiki_menu || Sidebars::Projects::Menus::WikiMenu).new(context))
+ add_menu(Sidebars::Projects::Menus::ExternalWikiMenu.new(context))
+ 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)
- confluence_menu.render? ? confluence_menu : Sidebars::Projects::Menus::WikiMenu.new(context)
+ wiki_menu_list.find { |wiki_menu| wiki_menu.new(context).render? }
end
end
end