diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 21:07:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 21:07:42 +0300 |
commit | 580622bdb3c762a8e89facd8a3946881ee480442 (patch) | |
tree | 3ac9d759da23f78f95f50684bd238a9f76839538 /app/controllers/groups | |
parent | b211a4ea14d5e9ed9b0c248a4e8c5c1d85b542cb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/registry/repositories_controller.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/app/controllers/groups/registry/repositories_controller.rb b/app/controllers/groups/registry/repositories_controller.rb index ac4ca197d72..0240c87e699 100644 --- a/app/controllers/groups/registry/repositories_controller.rb +++ b/app/controllers/groups/registry/repositories_controller.rb @@ -4,7 +4,6 @@ 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 respond_to do |format| @@ -17,12 +16,8 @@ module Groups serializer = ContainerRepositoriesSerializer .new(current_user: current_user) - if Feature.enabled?(:vue_container_registry_explorer, group) - render json: serializer.with_pagination(request, response) - .represent_read_only(@images) - else - render json: serializer.represent_read_only(@images) - end + render json: serializer.with_pagination(request, response) + .represent_read_only(@images) end end end @@ -34,10 +29,6 @@ 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 |