Fix protobuf compatibility issue with patch

This commit is contained in:
Pirate Praveen 2020-03-22 21:33:45 +05:30
parent b62360f104
commit bc282abd11
2 changed files with 21 additions and 0 deletions

View file

@ -0,0 +1,20 @@
From 3c23634c00ce6c03ea67d74bbfde593a694cee07 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
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

View file

@ -32,3 +32,4 @@
0750-fix-relative-paths.patch 0750-fix-relative-paths.patch
0770-bump-node-d3.patch 0770-bump-node-d3.patch
0780-embed-doorkeeper.patch 0780-embed-doorkeeper.patch
0790-protobuf-compat.patch