summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-04-20 16:48:38 +0100
committerNick Thomas <nick@gitlab.com>2018-04-20 18:48:45 +0100
commit26ea4397e81ad59483ceeeaf433acc9a2e95505e (patch)
tree3bfc6e42a663001706dcd96744de7a23a3ed7208 /Gemfile.lock
parentbadada043414044980e1455287056f294d137efa (diff)
downloadgitlab-ce-10-7-stable-patch-1-fix-gitaly-proto-version.tar.gz
GetSnapshot RPC requires gitaly-proto v0.9610-7-stable-patch-1-fix-gitaly-proto-version
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
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)