summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-30 09:10:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-30 09:10:05 +0000
commita16109b67fdee47ff1ccf4c0c831a0b47a17ab34 (patch)
tree9199632ee66c3076dfeea279e42e91b2827b5ece /lib/api
parent52c7972910b960f37ae9792cb4d17876244d4bcf (diff)
downloadgitlab-ce-a16109b67fdee47ff1ccf4c0c831a0b47a17ab34.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/concerns/packages/debian_package_endpoints.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/api/concerns/packages/debian_package_endpoints.rb b/lib/api/concerns/packages/debian_package_endpoints.rb
index e1a14c37d8c..0acc015f366 100644
--- a/lib/api/concerns/packages/debian_package_endpoints.rb
+++ b/lib/api/concerns/packages/debian_package_endpoints.rb
@@ -71,7 +71,7 @@ module API
route_setting :authentication, authenticate_non_public: true
get 'Release.gpg' do
- not_found!
+ distribution_from!(project_or_group).file_signature
end
# GET {projects|groups}/:id/packages/debian/dists/*distribution/Release
@@ -91,8 +91,7 @@ module API
route_setting :authentication, authenticate_non_public: true
get 'InRelease' do
- # Signature to be added in 7.3 of https://gitlab.com/groups/gitlab-org/-/epics/6057#note_582697034
- present_carrierwave_file!(distribution_from!(project_or_group).file)
+ present_carrierwave_file!(distribution_from!(project_or_group).signed_file)
end
params do