summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-04 15:07:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-04 15:07:36 +0000
commitaa542224bb345acf0cb9a1a606f0a802c16b0336 (patch)
tree496540a29aec55c6faeec7b0140824547046ae6c /lib
parent2494b608a460c46c759ad84bb29e6cc3447499a1 (diff)
downloadgitlab-ce-aa542224bb345acf0cb9a1a606f0a802c16b0336.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/api/group_container_repositories.rb2
-rw-r--r--lib/api/project_container_repositories.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/group_container_repositories.rb b/lib/api/group_container_repositories.rb
index fd24662cc9a..d1aaafec8aa 100644
--- a/lib/api/group_container_repositories.rb
+++ b/lib/api/group_container_repositories.rb
@@ -23,7 +23,7 @@ module API
end
get ':id/registry/repositories' do
repositories = ContainerRepositoriesFinder.new(
- id: user_group.id, container_type: :group
+ user: current_user, subject: user_group
).execute
present paginate(repositories), with: Entities::ContainerRegistry::Repository, tags: params[:tags]
diff --git a/lib/api/project_container_repositories.rb b/lib/api/project_container_repositories.rb
index 2a05974509a..c7731b70f39 100644
--- a/lib/api/project_container_repositories.rb
+++ b/lib/api/project_container_repositories.rb
@@ -24,7 +24,7 @@ module API
end
get ':id/registry/repositories' do
repositories = ContainerRepositoriesFinder.new(
- id: user_project.id, container_type: :project
+ user: current_user, subject: user_project
).execute
present paginate(repositories), with: Entities::ContainerRegistry::Repository, tags: params[:tags]