diff options
| author | Stan Hu <stanhu@gmail.com> | 2022-11-15 21:01:32 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2022-11-15 21:01:32 +0300 |
| commit | 00e38c6e1292c7f6d2d3c4fc0435c86ee9233249 (patch) | |
| tree | 00fa5053864dc03b0d6ea004497d7396d8439a23 | |
| parent | 4a303fcf697f8b248a7a713978a5b56ae291d3b9 (diff) | |
| parent | 144a69adaca7ca5e926e0cd815c955d3e54d9992 (diff) | |
Merge branch 'upgrade-redis-gem' into 'master'
Upgrade redis gem to v4.8.0
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5056
Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Heinrich Lee Yu <heinrich@gitlab.com>
| -rw-r--r-- | ruby/Gemfile | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 89bafb90f..5c9feca5c 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -21,6 +21,11 @@ gem 'licensee', '~> 9.15' gem 'google-protobuf', '~> 3.21.9' +# Rails is currently blocked on the upgrade to the new major version for Redis, +# so we don't upgrade either until the issue is resolved. This is an indirect +# dependency and can thus be removed when the version constraint is gone. +gem 'redis', '~> 4.8.0' + group :development, :test do gem 'rubocop', '~> 0.69', require: false gem 'rspec', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 23521a239..85f0f5c03 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -134,7 +134,7 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - redis (4.7.1) + redis (4.8.0) regexp_parser (1.8.1) reverse_markdown (1.4.0) nokogiri @@ -214,6 +214,7 @@ DEPENDENCIES licensee (~> 9.15) pry (~> 0.12.2) rbtrace + redis (~> 4.8.0) rspec rspec-parameterized rubocop (~> 0.69) |