summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-10-11 10:48:34 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-10-11 10:48:34 +0200
commit469dd52e46944e363fa137527b02e6e943168d39 (patch)
tree938b4cfe46e9f723441f84d4a9ec343e4cb0b50c
parent019032747a6a85fd0b86a1deda2f84fe25c63729 (diff)
downloadgitlab-ce-remove-gitaly-exists.tar.gz
WIP remove gitaly exists rpcremove-gitaly-exists
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock21
2 files changed, 16 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index c1988aea803..a98344674b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -398,7 +398,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.41.0', require: 'gitaly'
+gem 'gitaly-proto', git: 'https://gitlab.com/gitlab-org/gitaly-proto.git', branch: 'remove-exists', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index f5712da7508..ceacc2da0ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+ remote: https://gitlab.com/gitlab-org/gitaly-proto.git
+ revision: 49f337efae805b3675b5000708f4258cdee29b54
+ branch: remove-exists
+ specs:
+ gitaly-proto (0.41.0)
+ google-protobuf (~> 3.1)
+ grpc (~> 1.0)
+
GEM
remote: https://rubygems.org/
specs:
@@ -273,9 +282,6 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.41.0)
- google-protobuf (~> 3.1)
- grpc (~> 1.0)
github-linguist (4.7.6)
charlock_holmes (~> 0.7.3)
escape_utils (~> 1.1.0)
@@ -324,7 +330,9 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.4.0.2)
+ google-protobuf (3.4.1.1)
+ googleapis-common-protos-types (1.0.0)
+ google-protobuf (~> 3.0)
googleauth (0.5.3)
faraday (~> 0.12)
jwt (~> 1.4)
@@ -351,8 +359,9 @@ GEM
rake
grape_logging (1.7.0)
grape
- grpc (1.6.0)
+ grpc (1.6.6)
google-protobuf (~> 3.1)
+ googleapis-common-protos-types (~> 1.0.0)
googleauth (~> 0.5.1)
haml (4.0.7)
tilt
@@ -1027,7 +1036,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly-proto (~> 0.41.0)
+ gitaly-proto!
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)