diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-05-25 15:13:58 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-05-25 15:13:58 +0300 |
| commit | 307f8ab481eeae2ab2a3d69f9aeadbfabc1140d9 (patch) | |
| tree | a481260c98c31cca10bade4a6f7269f7a2fdfe61 | |
| parent | 154dbac26db15c1bbbfde553860664cd0803b6ba (diff) | |
| parent | 4593df0beecd669aea9678bc2aa7c7fc43ef8638 (diff) | |
Merge branch 'grpc-1.11' into 'master'
Use grpc 1.11.0 in gitaly-ruby
See merge request gitlab-org/gitaly!732
| -rw-r--r-- | changelogs/unreleased/grpc-1-11.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/grpc-1-11.yml b/changelogs/unreleased/grpc-1-11.yml new file mode 100644 index 000000000..5f0aa7529 --- /dev/null +++ b/changelogs/unreleased/grpc-1-11.yml @@ -0,0 +1,5 @@ +--- +title: Use grpc 1.11.0 in gitaly-ruby +merge_request: 732 +author: +type: fixed diff --git a/ruby/Gemfile b/ruby/Gemfile index 1f83d7088..4d89e2f0d 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -8,7 +8,7 @@ gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false -gem 'grpc', '~> 1.10.0' +gem 'grpc', '~> 1.11.0' gem 'sentry-raven', '~> 2.7.2', require: false gem 'faraday', '~> 0.12' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 740ebb159..c6d9562c2 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -60,7 +60,7 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.10.0) + grpc (1.11.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -149,7 +149,7 @@ DEPENDENCIES gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.0.0) google-protobuf (= 3.5.1) - grpc (~> 1.10.0) + grpc (~> 1.11.0) licensee (~> 8.9.0) rdoc (~> 4.2) rspec |