diff --git a/Gemfile b/Gemfile index e1862c04c5c7a092557301cf279e32838da34bb2..f6ecd52da528280385b1f40c1c0f2d300aae0b69 100644 --- a/Gemfile +++ b/Gemfile @@ -371,8 +371,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.10.3' # rubocop:todo Gemfile/MissingFeatureCategory - -gem 'gitlab-labkit', '~> 0.35.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-labkit', '~> 0.36.0', feature_category: :shared gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n @@ -598,7 +597,7 @@ gem 'gitaly', '~> 16.11.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management -gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'grpc', '~> 1.62', feature_category: :shared gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.checksum b/Gemfile.checksum index 937b3534e97a25cbeb9bd5df82d8d633505a8a23..476c0f8f31ebc490f7db1b1740d3bbfb86d98920 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -217,7 +217,7 @@ {"name":"gitlab-glfm-markdown","version":"0.0.14","platform":"ruby","checksum":"96394f039923b569f3cc53ea852436bfa1582fb9e37b8b0be2fd5dd115ed363a"}, {"name":"gitlab-glfm-markdown","version":"0.0.14","platform":"x86_64-darwin","checksum":"df7ac87711d0be2b0073ad19e00ea72e1216a6461df6eb78e81a576ec9cb57c2"}, {"name":"gitlab-glfm-markdown","version":"0.0.14","platform":"x86_64-linux","checksum":"09dffdfa3fe4f0af2a90a5b94475cfe82b31b96b2a207ae475091434a15df54c"}, -{"name":"gitlab-labkit","version":"0.35.1","platform":"ruby","checksum":"e9501b33633a2a1bb3e5a7de640d713efb50565eb77cbd13f6a0780a835f81d4"}, +{"name":"gitlab-labkit","version":"0.36.0","platform":"ruby","checksum":"35f21d1c3870ed0c9b8321e25d0b0b0b5021805a5d0525d1eb0fde6b103af981"}, {"name":"gitlab-license","version":"2.4.0","platform":"ruby","checksum":"fd238fb1e605a6b9250d4eb1744434ffd131f18d50a3be32f613c883f7635e20"}, {"name":"gitlab-mail_room","version":"0.0.24","platform":"ruby","checksum":"c7bf3df73dbcc024bc98dbf72514520ac2ff2b6d0124de496279fe56c13c3cb3"}, {"name":"gitlab-markup","version":"1.9.0","platform":"ruby","checksum":"7eda045a08ec2d110084252fa13a8c9eac8bdac0e302035ca7db4b82bcbd7ed4"}, @@ -279,15 +279,15 @@ {"name":"graphql","version":"2.2.5","platform":"ruby","checksum":"15eeb4b4b29b8502de22e6f2794ea5b7bf75b3a8c0aa5d776f5e614ef543bc7e"}, {"name":"graphql-client","version":"0.19.0","platform":"ruby","checksum":"fe699d81976f916bd8f989216155326449cb8475a5d69fa1dd054012a86969c7"}, {"name":"graphql-docs","version":"4.0.0","platform":"ruby","checksum":"f68296959263db26e1b7ba7058856d67b641cf508187222268be58f09dfa02d7"}, -{"name":"grpc","version":"1.60.0","platform":"aarch64-linux","checksum":"f8b29900bf9a8f18ac362da4057983ad7fe3774bec3f308ac3f3006669c670f9"}, -{"name":"grpc","version":"1.60.0","platform":"arm64-darwin","checksum":"57e4477f85fd98822b9421a5c702c642ff8a8cc1624ec4325604867017c67ec3"}, -{"name":"grpc","version":"1.60.0","platform":"ruby","checksum":"16bfba8b82e2032fa2b17fe7a4f4436540b257e28ef3842eb54811ef8b87f3af"}, -{"name":"grpc","version":"1.60.0","platform":"x64-mingw-ucrt","checksum":"be559573aaa506c36a53242bf4fcb665c209986dca6a5faa3c12ccfb33763412"}, -{"name":"grpc","version":"1.60.0","platform":"x64-mingw32","checksum":"687f29c0cf1540ebbb0138d66f9815602b129a093d03926f4896358bf20c9cc0"}, -{"name":"grpc","version":"1.60.0","platform":"x86-linux","checksum":"82b8fd2ec6966d9fbec7b808f46f5afd7d539c03951e8f81d2a32066822c33f3"}, -{"name":"grpc","version":"1.60.0","platform":"x86-mingw32","checksum":"ef13d5c581722f4796cf152f70cafc37cc8b1be29613cee1913928bde1c6b325"}, -{"name":"grpc","version":"1.60.0","platform":"x86_64-darwin","checksum":"985654b2e377bba198bcc60f76608892c58b8c09b09b39b970313ad27377af27"}, -{"name":"grpc","version":"1.60.0","platform":"x86_64-linux","checksum":"329291eba6566c4a20a3667f14efcf90e93749d6855d7c8d302604e9803cf82c"}, +{"name":"grpc","version":"1.62.0","platform":"aarch64-linux","checksum":"da4a327c031408537d573ac8e32c0457f96043382865f246cc5d8707af1d74ce"}, +{"name":"grpc","version":"1.62.0","platform":"arm64-darwin","checksum":"3bed38060eaec814a9547f88369c49b9bb3d439ff1832ccff30130459af919e0"}, +{"name":"grpc","version":"1.62.0","platform":"ruby","checksum":"f624d44ce89764ed61bd0d8c585bd6d7ec4b75ad421bdc7b370f09f101f6e80f"}, +{"name":"grpc","version":"1.62.0","platform":"x64-mingw-ucrt","checksum":"5618e4c7c708c1f10c905fd61689134ebc8b4df066fdd744b94b62d53e9bf5ea"}, +{"name":"grpc","version":"1.62.0","platform":"x64-mingw32","checksum":"5e2275f8e013342dfa0d7af028f3449849fc9cad163c5fafd8ae4c9be37b50e3"}, +{"name":"grpc","version":"1.62.0","platform":"x86-linux","checksum":"3e6a37edc951fcb77c14625a83141f39a98baf86f28fa3be0d552a888385d94d"}, +{"name":"grpc","version":"1.62.0","platform":"x86-mingw32","checksum":"40d42f50877fdaf26cd37836e2388f61d9c896d268f53e7493bb259b3a669806"}, +{"name":"grpc","version":"1.62.0","platform":"x86_64-darwin","checksum":"22eb3a8d36de1da327045a57c753b45c873c12a82106e8edef40ac0a01f37776"}, +{"name":"grpc","version":"1.62.0","platform":"x86_64-linux","checksum":"59f052fda776769f12b815495f9e1f2bc9501e5a194646720eb1d73f190e9502"}, {"name":"grpc-google-iam-v1","version":"1.5.0","platform":"ruby","checksum":"cea356d150dac69751f6a4c71f1571c8022c69d9f4ce9c18139200932c19374e"}, {"name":"gssapi","version":"1.3.1","platform":"ruby","checksum":"c51cf30842ee39bd93ce7fc33e20405ff8a04cda9dec6092071b61258284aee1"}, {"name":"guard","version":"2.16.2","platform":"ruby","checksum":"71ba7abaddecc8be91ab77bbaf78f767246603652ebbc7b976fda497ebdc8fbb"}, diff --git a/Gemfile.lock b/Gemfile.lock index a9a9421e2deae52ba0bdf1ab176ed2cc763a118e..da5d5dcac7012d7536c75c4d09ca092f84a20694 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -702,10 +702,10 @@ GEM mime-types gitlab-glfm-markdown (0.0.14) rb_sys (~> 0.9.86) - gitlab-labkit (0.35.1) + gitlab-labkit (0.36.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) - grpc (>= 1.37) + grpc (>= 1.62) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (>= 4.2.3, < 6.0) @@ -883,7 +883,7 @@ GEM gemoji (~> 3.0) graphql (~> 2.0) html-pipeline (~> 2.14, >= 2.14.3) - grpc (1.60.0) + grpc (1.62.0) google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) grpc-google-iam-v1 (1.5.0) @@ -2017,7 +2017,7 @@ DEPENDENCIES gitlab-glfm-markdown (~> 0.0.14) gitlab-housekeeper! gitlab-http! - gitlab-labkit (~> 0.35.1) + gitlab-labkit (~> 0.36.0) gitlab-license (~> 2.4) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0) @@ -2063,7 +2063,7 @@ DEPENDENCIES graphlyte (~> 1.0.0) graphql (~> 2.2.5) graphql-docs (~> 4.0.0) - grpc (~> 1.60.0) + grpc (~> 1.62) gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.57)