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:
Diffstat (limited to 'lib/api/composer_packages.rb')
-rw-r--r--lib/api/composer_packages.rb5
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!