diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-05-11 15:24:27 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-05-11 15:24:27 +0300 |
| commit | dbccf80baf069613b7cb86011e594bd737ebcee6 (patch) | |
| tree | 407be476703136451224a0d4fccc6aff64cf96a2 | |
| parent | e892790afe2e2339c41e61b22016c2369589077f (diff) | |
| parent | 82725bf72f889db0d82f50d602ce978b1c3d4621 (diff) | |
Merge branch 'revert-22654ba4' into 'master'
Revert update google-protobuf to 3.15.8
See merge request gitlab-org/gitaly!3440
| -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, 3 insertions, 8 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 deleted file mode 100644 index 7c6ea4018..000000000 --- a/changelogs/unreleased/update-google-protobuf-to-3-15-8.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 8231cff4d..adee2020f 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.15.8' +gem 'google-protobuf', '~> 3.14.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index b96739d7c..a8e2f3f5a 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.15.8) + google-protobuf (3.14.0) 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.15.8) + google-protobuf (~> 3.14.0) grpc (~> 1.30.2) grpc-tools (= 1.30.2) licensee (~> 9.14.1) |