diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-01-03 12:52:37 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-01-03 12:52:37 +0300 |
| commit | c3dfc0b4d5cdcc24b15c05c5f32aa6f549991d0c (patch) | |
| tree | 931a1180893b692bf5f7fab97075f24f279e43ed | |
| parent | 02972e5bb08285d518a79fd172199410d2217328 (diff) | |
| parent | 6e05b8a50005462d38016eca1a82539a9c94184c (diff) | |
Merge branch 'sh-upgrade-gitaly-proto-for-ruby' into 'master'
Upgrade Ruby gitaly-proto to 1.5.0 to match Go version
See merge request gitlab-org/gitaly!1018
| -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 81f186409..e17ac114a 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.16.5' gem 'rugged', '~> 0.27' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.6.5' -gem 'gitaly-proto', '~> 1.3.0' +gem 'gitaly-proto', '~> 1.5.0' 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 59f8ad69f..8c2811fec 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -30,7 +30,7 @@ GEM multipart-post (>= 1.2, < 3) gemojione (3.3.0) json - gitaly-proto (1.3.0) + gitaly-proto (1.5.0) grpc (~> 1.0) github-linguist (6.2.0) charlock_holmes (~> 0.7.6) @@ -151,7 +151,7 @@ DEPENDENCIES bundler (>= 1.16.5) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.5.0) github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) |