summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-04-23 11:05:15 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-04-23 11:05:15 +0000
commit5cecb2ba410de7b37cf5f12fbd08e80f538e21e1 (patch)
tree3bfc6e42a663001706dcd96744de7a23a3ed7208
parentbadada043414044980e1455287056f294d137efa (diff)
parent26ea4397e81ad59483ceeeaf433acc9a2e95505e (diff)
downloadgitlab-ce-5cecb2ba410de7b37cf5f12fbd08e80f538e21e1.tar.gz
Merge branch '10-7-stable-patch-1-fix-gitaly-proto-version' into '10-7-stable-patch-1'
Fix gitaly-proto version for gitlab-ce v10.7.1 See merge request gitlab-org/gitlab-ce!18510
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 848580aee41..6a6dc32b406 100644
--- a/Gemfile
+++ b/Gemfile
@@ -421,7 +421,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.94.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.96.0', require: 'gitaly'
gem 'grpc', '~> 1.10.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
diff --git a/Gemfile.lock b/Gemfile.lock
index c087500c5df..75c7b418a61 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -290,9 +290,9 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.94.0)
+ gitaly-proto (0.96.0)
google-protobuf (~> 3.1)
- grpc (~> 1.0)
+ grpc (~> 1.10)
github-linguist (5.3.3)
charlock_holmes (~> 0.7.5)
escape_utils (~> 1.1.0)
@@ -1061,7 +1061,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 0.94.0)
+ gitaly-proto (~> 0.96.0)
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)