Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/sidebars/projects/menus/packages_registries_menu.rb b/lib/sidebars/projects/menus/packages_registries_menu.rb
index 2d12bfbd6bb..0826349f6d3 100644
--- a/lib/sidebars/projects/menus/packages_registries_menu.rb
+++ b/lib/sidebars/projects/menus/packages_registries_menu.rb
@@ -48,7 +48,7 @@ module Sidebars
         end
 
         def container_registry_menu_item
-          if !::Gitlab.config.registry.enabled || !can?(context.current_user, :read_container_image, context.project)
+          if container_registry_unavailable?
             return ::Sidebars::NilMenuItem.new(item_id: :container_registry)
           end
 
@@ -122,7 +122,14 @@ module Sidebars
           !::Gitlab.config.packages.enabled ||
             !can?(context.current_user, :read_package, context.project&.packages_policy_subject)
         end
+
+        def container_registry_unavailable?
+          !::Gitlab.config.registry.enabled ||
+            !can?(context.current_user, :read_container_image, context.project)
+        end
       end
     end
   end
 end
+
+Sidebars::Projects::Menus::PackagesRegistriesMenu.prepend_mod_with('Sidebars::Projects::Menus::PackagesRegistriesMenu')