summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-08-24 14:59:06 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-08-24 14:59:06 +0200
commit1971ae18f670775d48dd78e844b784d432ddaaca (patch)
tree5644237dc7f50484e80e2d9fd10f60fff75bccee
parentc1f12ff58e8d66daaa1b2dd86259793751a89d69 (diff)
downloadgitlab-ce-1971ae18f670775d48dd78e844b784d432ddaaca.tar.gz
Use gitaly-proto 0.31.0gitaly-gem-rename
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 72fc2de426e..32539842dbb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -401,7 +401,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly', '~> 0.30.0'
+gem 'gitaly-proto', '~> 0.31.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d3c53ee010..780939df03a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -275,7 +275,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly (0.30.0)
+ gitaly-proto (0.31.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -1019,7 +1019,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly (~> 0.30.0)
+ gitaly-proto (~> 0.31.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.1)