diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-06-11 11:11:19 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-06-11 11:11:19 +0300 |
| commit | 2ef1b479235d1bf40067d72f9bb38761e85efbf3 (patch) | |
| tree | 6e3cda0fecba89ce18984db9d1e987b79c465af4 | |
| parent | 4e9a7dccc2608b6017d6b6a9e90b161fc2d03437 (diff) | |
| parent | 635706b8c51f6f5357ed6b0777682928b53594e5 (diff) | |
Merge branch 'gitaly-proto_1.32' into 'master'
Bump gitaly-proto to 1.32.0
See merge request gitlab-org/gitaly!1300
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 0b0a38bc9..1ad7f4c77 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' gem 'activesupport', '~> 5.1.7' -gem 'gitaly-proto', '~> 1.27.0' +gem 'gitaly-proto', '~> 1.32.0' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index ecc711e06..852b3f332 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -49,7 +49,7 @@ GEM ffi (1.10.0) gemojione (3.3.0) json - gitaly-proto (1.27.0) + gitaly-proto (1.32.0) grpc (~> 1.0) github-linguist (6.4.1) charlock_holmes (~> 0.7.6) @@ -217,7 +217,7 @@ DEPENDENCIES bundler (>= 1.17.3) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.27.0) + gitaly-proto (~> 1.32.0) github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) |