diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 13:05:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 13:05:05 +0000 |
commit | 8fa311a5de24a28d8190b0a038fb893e71184eb2 (patch) | |
tree | ae489a4ab340f24312cc1d968f74e5b22ac094d4 /lib/api | |
parent | 0fabe9336cf7cf2a31156931e716e84fc45e842f (diff) | |
download | gitlab-ce-8fa311a5de24a28d8190b0a038fb893e71184eb2.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/group_packages.rb | 2 | ||||
-rw-r--r-- | lib/api/project_packages.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/group_packages.rb b/lib/api/group_packages.rb index d9010dfd329..e396c9608cf 100644 --- a/lib/api/group_packages.rb +++ b/lib/api/group_packages.rb @@ -43,7 +43,7 @@ module API declared(params).slice(:exclude_subgroups, :order_by, :sort, :package_type, :package_name, :include_versionless, :status) ).execute - present paginate(packages), with: ::API::Entities::Package, user: current_user, group: true, namespace: user_group.root_ancestor + present paginate(packages), with: ::API::Entities::Package, user: current_user, group: true, namespace: user_group end end end diff --git a/lib/api/project_packages.rb b/lib/api/project_packages.rb index 276cbe50e42..35a68ec4e18 100644 --- a/lib/api/project_packages.rb +++ b/lib/api/project_packages.rb @@ -41,7 +41,7 @@ module API declared_params.slice(:order_by, :sort, :package_type, :package_name, :include_versionless, :status) ).execute - present paginate(packages), with: ::API::Entities::Package, user: current_user, namespace: user_project.root_ancestor + present paginate(packages), with: ::API::Entities::Package, user: current_user, namespace: user_project.namespace end desc 'Get a single project package' do @@ -55,7 +55,7 @@ module API package = ::Packages::PackageFinder .new(user_project, params[:package_id]).execute - present package, with: ::API::Entities::Package, user: current_user, namespace: user_project.root_ancestor + present package, with: ::API::Entities::Package, user: current_user, namespace: user_project.namespace end desc 'Remove a package' do |