GitLab steht Mittwoch, den 23. September, zwischen 10:00 und 12:00 Uhr aufgrund von Wartungsarbeiten nicht zur Verfügung.

Commit 41956773 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Reorganize container repository controllers and views

parent 4726ff9d
class Projects::ContainerRegistryController < Projects::ApplicationController
before_action :verify_registry_enabled
before_action :authorize_read_container_image!
before_action :authorize_update_container_image!, only: [:destroy]
layout 'project'
def index
@images = project.container_repositories
end
def destroy
if tag
delete_tag
else
delete_image
end
end
private
def registry_url
@registry_url ||= namespace_project_container_registry_index_path(project.namespace, project)
end
def verify_registry_enabled
render_404 unless Gitlab.config.registry.enabled
end
def delete_image
if image.destroy
redirect_to registry_url
else
redirect_to registry_url, alert: 'Failed to remove image'
end
end
def delete_tag
if tag.delete
image.destroy if image.tags.empty?
redirect_to registry_url
else
redirect_to registry_url, alert: 'Failed to remove tag'
end
end
def image
@image ||= project.container_repositories.find_by(id: params[:id])
end
def tag
@tag ||= image.tag(params[:tag]) if params[:tag].present?
end
end
module Projects
module Registry
class ApplicationController < Projects::ApplicationController
layout 'project'
before_action :verify_registry_enabled
before_action :authorize_read_container_image!
end
end
end
module Projects
module Registry
class RepositoriesController < ::Projects::Registry::ApplicationController
before_action :authorize_update_container_image!, only: [:destroy]
def index
@images = project.container_repositories
end
def destroy
if tag
delete_tag
else
delete_image
end
end
private
def registry_url
@registry_url ||= namespace_project_container_registry_index_path(project.namespace, project)
end
def verify_registry_enabled
render_404 unless Gitlab.config.registry.enabled
end
def delete_image
if image.destroy
redirect_to registry_url
else
redirect_to registry_url, alert: 'Failed to remove image'
end
end
def delete_tag
if tag.delete
image.destroy if image.tags.empty?
redirect_to registry_url
else
redirect_to registry_url, alert: 'Failed to remove tag'
end
end
def image
@image ||= project.container_repositories.find_by(id: params[:id])
end
def tag
@tag ||= image.tag(params[:tag]) if params[:tag].present?
end
end
end
end
module Projects
module Registry
class TagsController < ::Projects::Registry::ApplicationController
before_action :authorize_update_container_image!, only: [:destroy]
end
end
end
......@@ -219,7 +219,10 @@ constraints(ProjectUrlConstrainer.new) do
end
end
resources :container_registry, only: [:index, :destroy], constraints: { id: Gitlab::Regex.container_registry_reference_regex }
resources :container_registry,
controller: 'registry/repositories',
only: [:index, :destroy],
constraints: { id: Gitlab::Regex.container_registry_reference_regex }
resources :milestones, constraints: { id: /\d+/ } do
member do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment