Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2022-08-30 17:52:48 +0300
committerStan Hu <stanhu@gmail.com>2022-08-30 17:52:48 +0300
commit170f0c1acf47ff25075b0a428f2798ac487fd2cb (patch)
treec49a0153a28d54df816c0cce6a551df501d404a4
parentf9e1f2dbff0355442e09b85032f15719d4cfe07b (diff)
parent92c240119e64b7120223902e876fddd4eff0f04e (diff)
Merge branch 'renovate/ruby-dependencies' into 'master'
ruby: Update dependency gitlab-labkit to '~> 0.24' See merge request gitlab-org/gitaly!4664
-rw-r--r--ruby/Gemfile2
-rw-r--r--ruby/Gemfile.lock24
2 files changed, 13 insertions, 13 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 478658e68..7fa9b5b30 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.23'
+gem 'gitlab-labkit', '~> 0.24'
# 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 4fb8ff557..616dabbe0 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
diff-lcs (1.3)
dotenv (2.7.6)
equalizer (0.0.11)
- erubi (1.10.0)
+ erubi (1.11.0)
escape_utils (1.2.2)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
@@ -65,9 +65,9 @@ GEM
gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
mime-types (>= 1.15)
rugged (~> 1.0)
- gitlab-labkit (0.23.0)
- actionpack (>= 5.0.0, < 7.0.0)
- activesupport (>= 5.0.0, < 7.0.0)
+ gitlab-labkit (0.24.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)
@@ -81,8 +81,8 @@ GEM
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-markup (1.7.1)
- google-protobuf (3.21.3)
- googleapis-common-protos-types (1.3.0)
+ google-protobuf (3.21.5)
+ googleapis-common-protos-types (1.4.0)
google-protobuf (~> 3.14)
grpc (1.42.0)
google-protobuf (~> 3.18)
@@ -112,7 +112,7 @@ GEM
mime-types-data (3.2020.1104)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
- minitest (5.16.2)
+ minitest (5.16.3)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.13.8)
@@ -139,8 +139,8 @@ GEM
public_suffix (4.0.7)
racc (1.6.0)
rack (2.2.4)
- rack-test (1.1.0)
- rack (>= 1.0, < 3)
+ rack-test (2.0.2)
+ rack (>= 1.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
@@ -152,7 +152,7 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.3.2)
- redis (4.4.0)
+ redis (4.8.0)
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.15.0)
+ thrift (0.16.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.23)
+ gitlab-labkit (~> 0.24)
gitlab-license_finder
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.21.0)