diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-04-29 13:10:25 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-04-29 13:10:25 +0300 |
| commit | 22654ba48106412ca6680366afe6a47389458720 (patch) | |
| tree | ca3d583b1522275b9d86cd9b455f504b7188697d | |
| parent | f6f340eff91d01a1e36e8c9c368d93c9bff5e4f5 (diff) | |
| parent | 1bb60fca85ce0ef5ee0ebfa63af6ad63ebb6e2c0 (diff) | |
Merge branch 'update-google-protobuf-to-3.15.8' into 'master'
Update google-protobuf to 3.15.8 to support Ruby 3.0
Closes #3583
See merge request gitlab-org/gitaly!3399
| -rw-r--r-- | changelogs/unreleased/update-google-protobuf-to-3-15-8.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/update-google-protobuf-to-3-15-8.yml b/changelogs/unreleased/update-google-protobuf-to-3-15-8.yml new file mode 100644 index 000000000..7c6ea4018 --- /dev/null +++ b/changelogs/unreleased/update-google-protobuf-to-3-15-8.yml @@ -0,0 +1,5 @@ +--- +title: Update google-protobuf to 3.15.8 to support Ruby 3.0 +merge_request: 3399 +author: Takuya Noguchi +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index adee2020f..8231cff4d 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -19,7 +19,7 @@ gem 'gitlab-labkit', '~> 0.16.2' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' -gem 'google-protobuf', '~> 3.14.0' +gem 'google-protobuf', '~> 3.15.8' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index a8e2f3f5a..b96739d7c 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -74,7 +74,7 @@ GEM pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) - google-protobuf (3.14.0) + google-protobuf (3.15.8) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) grpc (1.30.2) @@ -223,7 +223,7 @@ DEPENDENCIES gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) gitlab-labkit (~> 0.16.2) gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.14.0) + google-protobuf (~> 3.15.8) grpc (~> 1.30.2) grpc-tools (= 1.30.2) licensee (~> 9.14.1) |