diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /lib/api/composer_packages.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'lib/api/composer_packages.rb')
-rw-r--r-- | lib/api/composer_packages.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/api/composer_packages.rb b/lib/api/composer_packages.rb index 0ac5cc45ccf..1181650fe96 100644 --- a/lib/api/composer_packages.rb +++ b/lib/api/composer_packages.rb @@ -38,6 +38,8 @@ module API packages = ::Packages::Composer::PackagesFinder.new(current_user, user_group).execute if params[:package_name].present? + params[:package_name], params[:sha] = params[:package_name].split('$') + packages = packages.with_name(params[:package_name]) end @@ -93,6 +95,7 @@ module API get ':id/-/packages/composer/*package_name', requirements: COMPOSER_ENDPOINT_REQUIREMENTS, file_path: true do not_found! if packages.empty? + not_found! if params[:sha].blank? presenter.package_versions end @@ -132,7 +135,7 @@ module API track_package_event('push_package', :composer) ::Packages::Composer::CreatePackageService - .new(authorized_user_project, current_user, declared_params) + .new(authorized_user_project, current_user, declared_params.merge(build: current_authenticated_job)) .execute created! |