From 184c2ced0761bd8dd7032619d16d3983fed7944a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 17 Oct 2019 18:08:05 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/groups/registry/repositories_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/controllers/groups') diff --git a/app/controllers/groups/registry/repositories_controller.rb b/app/controllers/groups/registry/repositories_controller.rb index 39f6963ee0a..e09a9e6eb21 100644 --- a/app/controllers/groups/registry/repositories_controller.rb +++ b/app/controllers/groups/registry/repositories_controller.rb @@ -4,6 +4,7 @@ module Groups class RepositoriesController < Groups::ApplicationController before_action :verify_container_registry_enabled! before_action :authorize_read_container_image! + before_action :feature_flag_group_container_registry_browser! def index track_event(:list_repositories) @@ -22,6 +23,10 @@ module Groups private + def feature_flag_group_container_registry_browser! + render_404 unless Feature.enabled?(:group_container_registry_browser, group) + end + def verify_container_registry_enabled! render_404 unless Gitlab.config.registry.enabled end -- cgit v1.2.1