diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/api/maven_packages.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/api/maven_packages.rb')
-rw-r--r-- | lib/api/maven_packages.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/api/maven_packages.rb b/lib/api/maven_packages.rb index 22f7b07809b..9e5705abe88 100644 --- a/lib/api/maven_packages.rb +++ b/lib/api/maven_packages.rb @@ -24,8 +24,6 @@ module API helpers do def path_exists?(path) - # return true when FF disabled so that processing the request is not stopped - return true unless Feature.enabled?(:check_maven_path_first, default_enabled: :yaml) return false if path.blank? Packages::Maven::Metadatum.with_path(path) @@ -132,7 +130,7 @@ module API when 'sha1' package_file.file_sha1 else - track_package_event('pull_package', :maven) if jar_file?(format) + track_package_event('pull_package', :maven, project: project, namespace: project.namespace) if jar_file?(format) present_carrierwave_file_with_head_support!(package_file.file) end end @@ -172,7 +170,7 @@ module API when 'sha1' package_file.file_sha1 else - track_package_event('pull_package', :maven) if jar_file?(format) + track_package_event('pull_package', :maven, project: package.project, namespace: package.project.namespace) if jar_file?(format) present_carrierwave_file_with_head_support!(package_file.file) end @@ -210,7 +208,7 @@ module API when 'sha1' package_file.file_sha1 else - track_package_event('pull_package', :maven) if jar_file?(format) + track_package_event('pull_package', :maven, project: user_project, namespace: user_project.namespace) if jar_file?(format) present_carrierwave_file_with_head_support!(package_file.file) end @@ -266,7 +264,7 @@ module API when 'md5' '' else - track_package_event('push_package', :maven) if jar_file?(format) + track_package_event('push_package', :maven, user: current_user, project: user_project, namespace: user_project.namespace) if jar_file?(format) file_params = { file: params[:file], |