diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /lib/sidebars/menu.rb | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
| download | gitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'lib/sidebars/menu.rb')
| -rw-r--r-- | lib/sidebars/menu.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sidebars/menu.rb b/lib/sidebars/menu.rb index dcdc130b0d7..3b8872fd572 100644 --- a/lib/sidebars/menu.rb +++ b/lib/sidebars/menu.rb @@ -12,6 +12,7 @@ module Sidebars include ::Sidebars::Concerns::Renderable include ::Sidebars::Concerns::ContainerWithHtmlOptions include ::Sidebars::Concerns::HasActiveRoutes + include ::Sidebars::Concerns::HasPartial attr_reader :context delegate :current_user, :container, to: :@context @@ -29,7 +30,7 @@ module Sidebars override :render? def render? - has_renderable_items? + has_renderable_items? || menu_with_partial? end # Menus might have or not a link |