diff options
| author | Stan Hu <stanhu@gmail.com> | 2023-03-08 00:56:19 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2023-03-08 00:56:19 +0300 |
| commit | ed5476b91eb68523edfe6612fbb6a24505a006e9 (patch) | |
| tree | 7e33775a8a73525cd3b5eb5f1ed1670ec3f11c13 | |
| parent | 998d1f6dbf9856c51d548814371cc6b8276086a6 (diff) | |
| parent | b42f8b7b59e4ce09eec460b4d222b46e330dcfbb (diff) | |
Merge branch 'renovate/ruby-dependencies' into 'master'
ruby: Update dependency gitlab-labkit to '~> 0.31', '>= 0.31.1'
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5466
Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 60d47057e..e44596ece 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -12,7 +12,7 @@ gem 'rbtrace', require: false gem 'gitaly', '~> 15.5.0' # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.31' +gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 249300455..a7dfb9bd7 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -40,7 +40,7 @@ GEM ffi (1.15.5) gitaly (15.5.0) grpc (~> 1.0) - gitlab-labkit (0.31.0) + gitlab-labkit (0.31.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -104,7 +104,7 @@ GEM method_source (~> 1.0) public_suffix (4.0.7) racc (1.6.2) - rack (2.2.6.2) + rack (2.2.6.3) rack-test (2.0.2) rack (>= 1.3) rails-dom-testing (2.0.3) @@ -167,7 +167,7 @@ GEM sentry-raven (3.1.2) faraday (>= 1.0) thor (1.1.0) - thrift (0.17.0) + thrift (0.18.1) tomlrb (2.0.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) @@ -187,7 +187,7 @@ DEPENDENCIES activesupport (~> 6.1.7.2) factory_bot gitaly (~> 15.5.0) - gitlab-labkit (~> 0.31) + gitlab-labkit (~> 0.31, >= 0.31.1) gitlab-license_finder gitlab-markup (~> 1.8.0) google-protobuf (~> 3.22.0) |