Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-04-05 15:18:42 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-04-05 15:18:42 +0300
commited0547b7c069eb1df002f6441cfa313ba6c6381e (patch)
tree7d9d600bf17582528b4933854e0c327d41987cf7 /app/controllers/projects/registry
parentee6f50027c3b8366d97a0170f99c24dfc23cd101 (diff)
Require container registry entities in controllers
Diffstat (limited to 'app/controllers/projects/registry')
-rw-r--r--app/controllers/projects/registry/repositories_controller.rb2
-rw-r--r--app/controllers/projects/registry/tags_controller.rb6
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects/registry/repositories_controller.rb b/app/controllers/projects/registry/repositories_controller.rb
index 2e18075d40f..737f8424ebf 100644
--- a/app/controllers/projects/registry/repositories_controller.rb
+++ b/app/controllers/projects/registry/repositories_controller.rb
@@ -21,7 +21,7 @@ module Projects
private
def image
- @image ||= project.container_repositories.find_by(id: params[:id])
+ @image ||= project.container_repositories.find(params[:id])
end
##
diff --git a/app/controllers/projects/registry/tags_controller.rb b/app/controllers/projects/registry/tags_controller.rb
index 138f9d14ee1..7a9f290e946 100644
--- a/app/controllers/projects/registry/tags_controller.rb
+++ b/app/controllers/projects/registry/tags_controller.rb
@@ -17,11 +17,13 @@ module Projects
def repository
@image ||= project.container_repositories
- .find_by(id: params[:repository_id])
+ .find(params[:repository_id])
end
def tag
- @tag ||= repository.tag(params[:id]) if params[:id].present?
+ return render_404 unless params[:id].present?
+
+ @tag ||= repository.tag(params[:id])
end
end
end