diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:10:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:10:03 +0300 |
commit | b6847c621ff246e6abceb90545d5a608318762d6 (patch) | |
tree | 460da2a6c2be2e4f5164c2bba1851b66260f850d /lib/api/commits.rb | |
parent | c08d9c22569d1c9e7c7737e183969593394133d9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/commits.rb')
-rw-r--r-- | lib/api/commits.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/api/commits.rb b/lib/api/commits.rb index dfb0066ceb0..086a1b7c402 100644 --- a/lib/api/commits.rb +++ b/lib/api/commits.rb @@ -356,7 +356,7 @@ module API present paginate(commit_merge_requests), with: Entities::MergeRequestBasic end - desc "Get a commit's GPG signature" do + desc "Get a commit's signature" do success Entities::CommitSignature end params do @@ -365,11 +365,9 @@ module API get ':id/repository/commits/:sha/signature', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do commit = user_project.commit(params[:sha]) not_found! 'Commit' unless commit + not_found! 'Signature' unless commit.has_signature? - signature = commit.signature - not_found! 'GPG Signature' unless signature - - present signature, with: Entities::CommitSignature + present commit, with: Entities::CommitSignature end end end |