diff options
| author | Stan Hu <stanhu@gmail.com> | 2022-10-12 10:31:03 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2022-10-12 10:31:03 +0300 |
| commit | e29f8f7ad0dc0924441448d35425bf3996d28131 (patch) | |
| tree | ac6f0729f66f5730437d022977496422adc42431 | |
| parent | d897d27c602d80b247af46a4ce672c2cd9b591ba (diff) | |
| parent | 18ec4663eab987cd34f4667765d8bf4d572ec500 (diff) | |
Merge branch 'renovate/ruby-dependencies' into 'master'
ruby: Update dependency gitlab-labkit to '~> 0.25'
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4854
Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | ruby/Gemfile | 7 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 13 |
2 files changed, 13 insertions, 7 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 7fa9b5b30..1da27d051 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.24' +gem 'gitlab-labkit', '~> 0.25' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE @@ -21,6 +21,11 @@ gem 'licensee', '~> 9.15' gem 'google-protobuf', '~> 3.21.0' +# 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.7.1' + 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 0ac851f3a..e497fe06d 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -65,14 +65,14 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.24.0) + gitlab-labkit (0.25.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) - redis (> 3.0.0, < 5.0.0) + redis (> 3.0.0, < 6.0.0) gitlab-license_finder (6.14.2.1) bundler rubyzip (>= 1, < 3) @@ -101,7 +101,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.18.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -152,7 +152,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.3.2) - redis (4.8.0) + redis (4.7.1) regexp_parser (1.8.1) reverse_markdown (1.4.0) nokogiri @@ -202,7 +202,7 @@ GEM stringex (2.8.5) thor (1.1.0) thread_safe (0.3.6) - thrift (0.16.0) + thrift (0.17.0) timecop (0.9.1) tomlrb (2.0.1) tzinfo (2.0.5) @@ -231,7 +231,7 @@ DEPENDENCIES github-linguist (~> 7.20.0) gitlab-gollum-lib (~> 4.2.7.10.gitlab.2) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.24) + gitlab-labkit (~> 0.25) gitlab-license_finder gitlab-markup (~> 1.7.1) google-protobuf (~> 3.21.0) @@ -241,6 +241,7 @@ DEPENDENCIES pry (~> 0.12.2) rbtrace rdoc (~> 6.0) + redis (~> 4.7.1) rspec rspec-parameterized rubocop (~> 0.69) |