Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 23 deletions

diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index 8fac3621df9..6210223917b 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -155,10 +155,6 @@ module Gitlab
           end
         end
 
-        def extract_signature(repository, commit_id)
-          repository.gitaly_commit_client.extract_signature(commit_id)
-        end
-
         def extract_signature_lazily(repository, commit_id)
           BatchLoader.for(commit_id).batch(key: repository) do |commit_ids, loader, args|
             batch_signature_extraction(args[:key], commit_ids).each do |commit_id, signature_data|
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index b0559729ff3..dca55091be6 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -348,25 +348,6 @@ module Gitlab
         end
       end
 
-      def extract_signature(commit_id)
-        request = Gitaly::ExtractCommitSignatureRequest.new(repository: @gitaly_repo, commit_id: commit_id)
-        response = GitalyClient.call(@repository.storage, :commit_service, :extract_commit_signature, request, timeout: GitalyClient.fast_timeout)
-
-        signature = +''.b
-        signed_text = +''.b
-
-        response.each do |message|
-          signature << message.signature
-          signed_text << message.signed_text
-        end
-
-        return if signature.blank? && signed_text.blank?
-
-        [signature, signed_text]
-      rescue GRPC::InvalidArgument => ex
-        raise ArgumentError, ex
-      end
-
       def get_commit_signatures(commit_ids)
         request = Gitaly::GetCommitSignaturesRequest.new(repository: @gitaly_repo, commit_ids: commit_ids)
         response = GitalyClient.call(@repository.storage, :commit_service, :get_commit_signatures, request, timeout: GitalyClient.fast_timeout)