diff options
author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-10-31 10:37:08 +0300 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-10-31 10:37:08 +0300 |
commit | d507694c461140b7c50b6bd399f93263e041b379 (patch) | |
tree | 0d42c50e98734721529185eba5ea460f1c0507a8 | |
parent | 0fac1b0f097f7eebbdc41ce8f20b4af0aa91710f (diff) | |
parent | 1de3cebb9cdbf7f4e37da9f83d0efb2b419302e4 (diff) |
Merge branch 'renovate/ruby-dependencies' into 'master'
ruby: Update Ruby dependencies
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4995
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
-rw-r--r-- | ruby/Gemfile | 4 | ||||
-rw-r--r-- | ruby/Gemfile.lock | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 26608e43a..91c724113 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -15,13 +15,13 @@ gem 'rbtrace', require: false gem 'gitaly', '~> 15.5.0' # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.26' +gem 'gitlab-labkit', '~> 0.28' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.15' -gem 'google-protobuf', '~> 3.21.8' +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 diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 9759bbf0e..ccd124f08 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -53,7 +53,7 @@ GEM escape_utils (~> 1.2.0) mini_mime (~> 1.0) rugged (~> 1.0) - gitlab-labkit (0.26.0) + gitlab-labkit (0.28.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -69,7 +69,7 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.7.1) - google-protobuf (3.21.8) + google-protobuf (3.21.9) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) grpc (1.42.0) @@ -208,10 +208,10 @@ DEPENDENCIES faraday (~> 1.0) gitaly (~> 15.5.0) github-linguist (~> 7.20.0) - gitlab-labkit (~> 0.26) + gitlab-labkit (~> 0.28) gitlab-license_finder gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.21.8) + google-protobuf (~> 3.21.9) grpc (~> 1.42.0) licensee (~> 9.15) pry (~> 0.12.2) @@ -226,4 +226,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.3.23 + 2.3.24 |