diff --git a/Gemfile b/Gemfile index 3638176c97bd271d075a94837ba5835d43fca39c..fc75f72ebeaf89cfb15fda9fc7d85bf84367d7f1 100644 --- a/Gemfile +++ b/Gemfile @@ -398,7 +398,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop: gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications -gem 'gitlab-labkit', '~> 0.36.0', feature_category: :shared +gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n diff --git a/Gemfile.checksum b/Gemfile.checksum index dc2e3e17ff4a6951ae08227daedd67a2201ea877..b2f219d0a7ec27f4910681e85677b14259e5fe55 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -232,7 +232,7 @@ {"name":"gitlab-glfm-markdown","version":"0.0.21","platform":"x86_64-darwin","checksum":"8425ee27e0b32b75619e08e1700c1302297b44928adc19a026bea243c96363f5"}, {"name":"gitlab-glfm-markdown","version":"0.0.21","platform":"x86_64-linux","checksum":"9ea7d7a7a20c15960839521459a82edab787a4d8475ee412beba8362aa5fcd71"}, {"name":"gitlab-kas-grpc","version":"17.5.1","platform":"ruby","checksum":"88639bfaa9301d78a7fbff696ec262ed696a15a6f41c1b51bffe6b39c7a61ca7"}, -{"name":"gitlab-labkit","version":"0.36.1","platform":"ruby","checksum":"04fb6941b7e5fc1fdcee8f9971fa2086a4dc442e39e67a74b992403dd580c300"}, +{"name":"gitlab-labkit","version":"0.37.0","platform":"ruby","checksum":"d2dd0a60db2149a9a8eebf2975dc23f54ac3ceb01bdba732eb1b26b86dfffa70"}, {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"}, {"name":"gitlab-mail_room","version":"0.0.25","platform":"ruby","checksum":"223ce7c3c0797b6015eaa37147884e6ddc7be9a7ee90a424358c96bc18613b1a"}, {"name":"gitlab-markup","version":"1.9.0","platform":"ruby","checksum":"7eda045a08ec2d110084252fa13a8c9eac8bdac0e302035ca7db4b82bcbd7ed4"}, diff --git a/Gemfile.lock b/Gemfile.lock index a5e3655b7f5d4a72a9d34817f40d971bceb99604..81230308dcd13779e668b3f54a26e3ae8fa3506c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -749,13 +749,13 @@ GEM rb_sys (= 0.9.94) gitlab-kas-grpc (17.5.1) grpc (~> 1.0) - gitlab-labkit (0.36.1) - actionpack (>= 5.0.0, < 8.0.0) - activesupport (>= 5.0.0, < 8.0.0) + gitlab-labkit (0.37.0) + actionpack (>= 5.0.0, < 8.1.0) + activesupport (>= 5.0.0, < 8.1.0) grpc (>= 1.62) jaeger-client (~> 1.1.0) opentracing (~> 0.4) - pg_query (>= 4.2.3, < 6.0) + pg_query (>= 5.1.0, < 7.0) redis (> 3.0.0, < 6.0.0) gitlab-license (2.6.0) gitlab-mail_room (0.0.25) @@ -2077,7 +2077,7 @@ DEPENDENCIES gitlab-housekeeper! gitlab-http! gitlab-kas-grpc (~> 17.5.0) - gitlab-labkit (~> 0.36.0) + gitlab-labkit (~> 0.37.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index a2286c07fb194ab001cf007cdcbb7b1a1f252990..38aae54493bf5b888876b72c0ced0c6a4ffa3d85 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -233,7 +233,7 @@ {"name":"gitlab-glfm-markdown","version":"0.0.21","platform":"x86_64-darwin","checksum":"8425ee27e0b32b75619e08e1700c1302297b44928adc19a026bea243c96363f5"}, {"name":"gitlab-glfm-markdown","version":"0.0.21","platform":"x86_64-linux","checksum":"9ea7d7a7a20c15960839521459a82edab787a4d8475ee412beba8362aa5fcd71"}, {"name":"gitlab-kas-grpc","version":"17.5.1","platform":"ruby","checksum":"88639bfaa9301d78a7fbff696ec262ed696a15a6f41c1b51bffe6b39c7a61ca7"}, -{"name":"gitlab-labkit","version":"0.36.1","platform":"ruby","checksum":"04fb6941b7e5fc1fdcee8f9971fa2086a4dc442e39e67a74b992403dd580c300"}, +{"name":"gitlab-labkit","version":"0.37.0","platform":"ruby","checksum":"d2dd0a60db2149a9a8eebf2975dc23f54ac3ceb01bdba732eb1b26b86dfffa70"}, {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"}, {"name":"gitlab-mail_room","version":"0.0.25","platform":"ruby","checksum":"223ce7c3c0797b6015eaa37147884e6ddc7be9a7ee90a424358c96bc18613b1a"}, {"name":"gitlab-markup","version":"1.9.0","platform":"ruby","checksum":"7eda045a08ec2d110084252fa13a8c9eac8bdac0e302035ca7db4b82bcbd7ed4"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 2e561627eb38d195820d470f8c33f8726c23817a..dafb78ca3b33d85646de4d228e3eaa8c5e8ace26 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -759,13 +759,13 @@ GEM rb_sys (= 0.9.94) gitlab-kas-grpc (17.5.1) grpc (~> 1.0) - gitlab-labkit (0.36.1) - actionpack (>= 5.0.0, < 8.0.0) - activesupport (>= 5.0.0, < 8.0.0) + gitlab-labkit (0.37.0) + actionpack (>= 5.0.0, < 8.1.0) + activesupport (>= 5.0.0, < 8.1.0) grpc (>= 1.62) jaeger-client (~> 1.1.0) opentracing (~> 0.4) - pg_query (>= 4.2.3, < 6.0) + pg_query (>= 5.1.0, < 7.0) redis (> 3.0.0, < 6.0.0) gitlab-license (2.6.0) gitlab-mail_room (0.0.25) @@ -2105,7 +2105,7 @@ DEPENDENCIES gitlab-housekeeper! gitlab-http! gitlab-kas-grpc (~> 17.5.0) - gitlab-labkit (~> 0.36.0) + gitlab-labkit (~> 0.37.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0)