diff --git a/debian/patches/0790-protobuf-compat.patch b/debian/patches/0790-protobuf-compat.patch new file mode 100644 index 0000000000..46ccfc5511 --- /dev/null +++ b/debian/patches/0790-protobuf-compat.patch @@ -0,0 +1,20 @@ +From 3c23634c00ce6c03ea67d74bbfde593a694cee07 Mon Sep 17 00:00:00 2001 +From: Pirate Praveen +Date: Sun, 22 Mar 2020 13:10:23 +0000 +Subject: [PATCH 2/2] Fix protobuf compatibility (Thanks to Stan Hu) + +--- + lib/api/helpers/internal_helpers.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/api/helpers/internal_helpers.rb ++++ b/lib/api/helpers/internal_helpers.rb +@@ -142,7 +142,7 @@ + return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action) + + { +- repository: repository.gitaly_repository, ++ repository: repository.gitaly_repository.to_h, + address: Gitlab::GitalyClient.address(project.repository_storage), + token: Gitlab::GitalyClient.token(project.repository_storage), + features: Feature::Gitaly.server_feature_flags diff --git a/debian/patches/series b/debian/patches/series index 8bb0395120..6e4098eed0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,3 +27,4 @@ 0740-use-packaged-modules.patch 0750-fix-relative-paths.patch 0760-update-grape.patch +0790-protobuf-compat.patch