diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2019-02-12 11:56:47 +0300 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2019-03-01 03:37:23 +0300 |
| commit | 71eacd7564310e89b1518408380ff6d2de652a34 (patch) | |
| tree | 084094d6093db2c29ce091fe6a22894cdfae6e14 | |
| parent | acdb4147d57ac1517363f8b1455ee06cce2dfc8f (diff) | |
Update gitaly-proto vendor and gem
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index fa9213a5c..d76eacb6b 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.16.5' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.6.5' -gem 'gitaly-proto', '~> 1.12.0' +gem 'gitaly-proto', git: 'https://gitlab.com/gitlab-org/gitaly-proto', branch: '45035-force-commit' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 7c1a67447..a55543696 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://gitlab.com/gitlab-org/gitaly-proto + revision: cd37c9e8df45d9f6abe2da7dd13831f592bca253 + branch: 45035-force-commit + specs: + gitaly-proto (1.10.0) + grpc (~> 1.0) + GEM remote: https://rubygems.org/ specs: @@ -36,8 +44,6 @@ GEM ffi (1.10.0) gemojione (3.3.0) json - gitaly-proto (1.12.0) - grpc (~> 1.0) github-linguist (6.2.0) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) @@ -182,7 +188,7 @@ DEPENDENCIES bundler (>= 1.16.5) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.12.0) + gitaly-proto! github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) |