diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 00:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 00:09:12 +0300 |
| commit | c083f926c5714ee4dcbb3ae497b14d4cb31aa794 (patch) | |
| tree | 2bc13107c4396e3263afe3c13b7e9e32f06a843b /lib/api/maven_packages.rb | |
| parent | 316fbf9f95dcdd16775f0339415572c3195eea92 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/maven_packages.rb')
| -rw-r--r-- | lib/api/maven_packages.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/maven_packages.rb b/lib/api/maven_packages.rb index bcd5d8e4a83..a3e2fa84c32 100644 --- a/lib/api/maven_packages.rb +++ b/lib/api/maven_packages.rb @@ -32,10 +32,10 @@ module API end def verify_package_file(package_file, uploaded_file) - stored_sha1 = Digest::SHA256.hexdigest(package_file.file_sha1) - expected_sha1 = uploaded_file.sha256 + stored_sha256 = Digest::SHA256.hexdigest(package_file.file_sha1) + expected_sha256 = uploaded_file.sha256 - if stored_sha1 == expected_sha1 + if stored_sha256 == expected_sha256 no_content! else conflict! @@ -231,7 +231,7 @@ module API verify_package_file(package_file, params[:file]) when 'md5' - nil + '' else track_package_event('push_package', :maven) if jar_file?(format) |