summaryrefslogtreecommitdiff
path: root/app/controllers/groups
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-17 18:08:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-17 18:08:05 +0000
commit184c2ced0761bd8dd7032619d16d3983fed7944a (patch)
treecc82b32ee7c1797509da3cf384617e4ffa2e1733 /app/controllers/groups
parent238d22c07218adf2b8f3db630ee8b74ca6f29df5 (diff)
downloadgitlab-ce-184c2ced0761bd8dd7032619d16d3983fed7944a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/groups')
-rw-r--r--app/controllers/groups/registry/repositories_controller.rb5
1 files changed, 5 insertions, 0 deletions
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