diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-10-24 12:13:13 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-10-24 12:13:13 +0300 |
| commit | 9001a0fd6f21966c7fa4cd0d00085a4faa86ba1f (patch) | |
| tree | ae033d8b0444b2365c98e59b63ecaa8f05ecf921 | |
| parent | 11454710ec8e672177e592fb10af49fb6351f17d (diff) | |
| parent | d796f5c51331757765feaf9dad740960d326f3ed (diff) | |
Merge branch 'sh-bump-google-protobuf-3.6.1' into 'master'
Bump google-protobuf gem to 3.6.1
See merge request gitlab-org/gitaly!941
| -rw-r--r-- | changelogs/unreleased/sh-bump-google-protobuf-3-6-1.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 3 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/changelogs/unreleased/sh-bump-google-protobuf-3-6-1.yml b/changelogs/unreleased/sh-bump-google-protobuf-3-6-1.yml new file mode 100644 index 000000000..c60b7cbd0 --- /dev/null +++ b/changelogs/unreleased/sh-bump-google-protobuf-3-6-1.yml @@ -0,0 +1,5 @@ +--- +title: Bump google-protobuf gem to 3.6.1 +merge_request: 941 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index 44accc405..269f61d03 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -19,8 +19,7 @@ gem 'faraday', '~> 0.12' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -# Locked until https://github.com/google/protobuf/issues/4210 is closed -gem 'google-protobuf', '= 3.5.1' +gem 'google-protobuf', '~> 3.6' group :development, :test do gem 'rubocop', '~> 0.50', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 20c316515..5afda76e5 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -46,7 +46,7 @@ GEM gitlab-markup (1.6.4) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - google-protobuf (3.5.1) + google-protobuf (3.6.1) googleapis-common-protos-types (1.0.2) google-protobuf (~> 3.0) grpc (1.15.0) @@ -122,7 +122,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-markup (~> 1.6.4) - google-protobuf (= 3.5.1) + google-protobuf (~> 3.6) grpc (~> 1.15.0) licensee (~> 8.9.0) rdoc (~> 4.2) |