From cf34f33ac906eb9011a6f1dc0979c9bfc4e09e59 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Fri, 2 Mar 2018 14:03:11 +0100
Subject: [PATCH] Lock gRPC gem to 1.8

Given 1.9 has issues we're aware of, for now we're locking to 1.8.
Closes gitlab-org/gitaly#1059 and will probably be removed if 1.10 is
tested an deemed ok.
---
 Gemfile      | 4 ++++
 Gemfile.lock | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index a3352b8923cf0..35f9b081fdf1a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -412,6 +412,10 @@ end
 
 # Gitaly GRPC client
 gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly'
+# Explicitly lock grpc as we know 1.9 is bad
+# 1.10 is still being tested. See gitlab-org/gitaly#1059
+gem 'grpc', '~> 1.8.3'
+
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
 gem 'google-protobuf', '= 3.5.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a5c94a9e0742c..010d4f7b56ac3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1073,6 +1073,7 @@ DEPENDENCIES
   grape-entity (~> 0.6.0)
   grape-route-helpers (~> 2.1.0)
   grape_logging (~> 1.7)
+  grpc (~> 1.8.3)
   haml_lint (~> 0.26.0)
   hamlit (~> 2.6.1)
   hashie-forbidden_attributes
-- 
GitLab