From 835965d1f61e3119942cbdb78a660f8e0c4eae5f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Jan 2025 06:32:11 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile | 2 +- Gemfile.checksum | 22 +++++++++++----------- Gemfile.lock | 4 ++-- Gemfile.next.checksum | 26 +++++++++++++------------- Gemfile.next.lock | 6 +++--- doc/ci/runners/hosted_runners/linux.md | 6 ++++++ 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/Gemfile b/Gemfile index 1e5103b9476..a044ef83379 100644 --- a/Gemfile +++ b/Gemfile @@ -268,7 +268,7 @@ gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown gem 'rouge', '~> 4.4.0', feature_category: :shared gem 'truncato', '~> 0.7.12', feature_category: :team_planning -gem 'nokogiri', '~> 1.16', feature_category: :shared +gem 'nokogiri', '~> 1.18', feature_category: :shared gem 'gitlab-glfm-markdown', '~> 0.0.21', feature_category: :markdown gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown gem 'unicode-emoji', '~> 4.0', feature_category: :markdown diff --git a/Gemfile.checksum b/Gemfile.checksum index 23c3760f05c..f0f0c98138c 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -428,17 +428,17 @@ {"name":"nio4r","version":"2.7.0","platform":"java","checksum":"3f2e515e928ceeef7668e1f64fc3bfef1417a5ec0908d8e69f2c6d486284e04d"}, {"name":"nio4r","version":"2.7.0","platform":"ruby","checksum":"9586a685eca8246d6406e712a525e705d15bb88f709d78fc3f141e864df97276"}, {"name":"no_proxy_fix","version":"0.1.2","platform":"ruby","checksum":"4e9b4c31bb146de7fcf347dc1087bb13ac2039b56d50aa019e61036256abcd00"}, -{"name":"nokogiri","version":"1.16.8","platform":"aarch64-linux","checksum":"b1d41cd9abf4180adef496cc8c9fcb5b2e38d39f5e23c8a2445362226a5df6b8"}, -{"name":"nokogiri","version":"1.16.8","platform":"arm-linux","checksum":"8cbd2971624fc073b9430d86475da031903494dcb83c2339e13f7f22a4de6fad"}, -{"name":"nokogiri","version":"1.16.8","platform":"arm64-darwin","checksum":"b7aa4e8533a720e432d09b52a2ec089b55cf3ee66c916b44a0d9b6608df7bf8c"}, -{"name":"nokogiri","version":"1.16.8","platform":"java","checksum":"8652028e72a38f2221c810550d03c91682b414e06f6271149139a9042cf727e6"}, -{"name":"nokogiri","version":"1.16.8","platform":"ruby","checksum":"dece4bf9a663b2d6b6e874716297ad414c95be694656972d54049bd088f752a1"}, -{"name":"nokogiri","version":"1.16.8","platform":"x64-mingw-ucrt","checksum":"23c9a8ae47afa2973cbca9e3d38c16f40ff336919f961802c4a3a5e39c767138"}, -{"name":"nokogiri","version":"1.16.8","platform":"x64-mingw32","checksum":"861e2d7f24b0c7f5ea2a26e6d99af7e727d7641f0eab27b9b6c51b8a0666c805"}, -{"name":"nokogiri","version":"1.16.8","platform":"x86-linux","checksum":"f97760e6320166d48234029bed9e999521a888376bd2b7e04f4c054537154f16"}, -{"name":"nokogiri","version":"1.16.8","platform":"x86-mingw32","checksum":"ea48d7415b89f5dd3ff5a8f82bb2ec56fdc3431444381143fe90bb418eb9ea35"}, -{"name":"nokogiri","version":"1.16.8","platform":"x86_64-darwin","checksum":"6c40d7dc444f752634bf6ee8b53a55c3cfca3f9df52be46b8abcc559ccd49e47"}, -{"name":"nokogiri","version":"1.16.8","platform":"x86_64-linux","checksum":"ed7b1f80713ac968dd93fe2b96fc3df6e448b73bd02dd77d5fc89ba92a1ed6d9"}, +{"name":"nokogiri","version":"1.18.2","platform":"aarch64-linux-gnu","checksum":"74e0f9a7487a30a2957f46c5113d58f836436b033c9906e0bc6fee9d8cdafabf"}, +{"name":"nokogiri","version":"1.18.2","platform":"aarch64-linux-musl","checksum":"99bcea596a80eaee99f2bae2596275641ea688262c1da32b4e90db6159e86477"}, +{"name":"nokogiri","version":"1.18.2","platform":"arm-linux-gnu","checksum":"6fb0246b69f2c589a69254e82bc2a40aa238c4f977fd7903e283341a92935729"}, +{"name":"nokogiri","version":"1.18.2","platform":"arm-linux-musl","checksum":"dcdd4d10ed2743f0d8c887825700c3a8506aea1aa415917ac50ccc01597c51a3"}, +{"name":"nokogiri","version":"1.18.2","platform":"arm64-darwin","checksum":"8288ec7a296e2510ca9bd053c0c5989f11260f8c07bc3e9afbafa536f7077281"}, +{"name":"nokogiri","version":"1.18.2","platform":"java","checksum":"eefdf9f0d6086173d3488cf7a736732ee13fb6674ef15643478c20502a67bf37"}, +{"name":"nokogiri","version":"1.18.2","platform":"ruby","checksum":"93791cfb33186fe077eb9e1b8a6855b5621e328f81f565334572fa398366f8bf"}, +{"name":"nokogiri","version":"1.18.2","platform":"x64-mingw-ucrt","checksum":"894514572fa7503ce9210e51a7f8a9a35f34f154d6406cec1ac148c3ce1536a3"}, +{"name":"nokogiri","version":"1.18.2","platform":"x86_64-darwin","checksum":"7fca165e5ee87e9b6b3f1377180376afc0c8652ed2a3d761f472f0e3d3a1c651"}, +{"name":"nokogiri","version":"1.18.2","platform":"x86_64-linux-gnu","checksum":"9330ced4a976604865c2a76ce158e2bc608fa83999552e85a32ec06f85f427db"}, +{"name":"nokogiri","version":"1.18.2","platform":"x86_64-linux-musl","checksum":"1cd7786ed15c76958d6a8f9a864df6208fecd624c340eb4ed211fbea60328f02"}, {"name":"notiffany","version":"0.1.3","platform":"ruby","checksum":"d37669605b7f8dcb04e004e6373e2a780b98c776f8eb503ac9578557d7808738"}, {"name":"numerizer","version":"0.2.0","platform":"ruby","checksum":"e58076d5ee5370417b7e52d9cb25836d62acd1b8d9a194c308707986c1705d7b"}, {"name":"oauth","version":"0.5.6","platform":"ruby","checksum":"4085fe28e0c5e2434135e00a6555294fd2a4ff96a98d1bdecdcd619fc6368dff"}, diff --git a/Gemfile.lock b/Gemfile.lock index c02d9c4f779..e2e3826788c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1201,7 +1201,7 @@ GEM netrc (0.11.0) nio4r (2.7.0) no_proxy_fix (0.1.2) - nokogiri (1.16.8) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -2188,7 +2188,7 @@ DEPENDENCIES net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) - nokogiri (~> 1.16) + nokogiri (~> 1.18) oauth2 (~> 2.0) octokit (~> 9.0) ohai (~> 18.1) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index 3c26bab39dd..af849c8922a 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -431,17 +431,17 @@ {"name":"nio4r","version":"2.7.0","platform":"java","checksum":"3f2e515e928ceeef7668e1f64fc3bfef1417a5ec0908d8e69f2c6d486284e04d"}, {"name":"nio4r","version":"2.7.0","platform":"ruby","checksum":"9586a685eca8246d6406e712a525e705d15bb88f709d78fc3f141e864df97276"}, {"name":"no_proxy_fix","version":"0.1.2","platform":"ruby","checksum":"4e9b4c31bb146de7fcf347dc1087bb13ac2039b56d50aa019e61036256abcd00"}, -{"name":"nokogiri","version":"1.16.8","platform":"aarch64-linux","checksum":"b1d41cd9abf4180adef496cc8c9fcb5b2e38d39f5e23c8a2445362226a5df6b8"}, -{"name":"nokogiri","version":"1.16.8","platform":"arm-linux","checksum":"8cbd2971624fc073b9430d86475da031903494dcb83c2339e13f7f22a4de6fad"}, -{"name":"nokogiri","version":"1.16.8","platform":"arm64-darwin","checksum":"b7aa4e8533a720e432d09b52a2ec089b55cf3ee66c916b44a0d9b6608df7bf8c"}, -{"name":"nokogiri","version":"1.16.8","platform":"java","checksum":"8652028e72a38f2221c810550d03c91682b414e06f6271149139a9042cf727e6"}, -{"name":"nokogiri","version":"1.16.8","platform":"ruby","checksum":"dece4bf9a663b2d6b6e874716297ad414c95be694656972d54049bd088f752a1"}, -{"name":"nokogiri","version":"1.16.8","platform":"x64-mingw-ucrt","checksum":"23c9a8ae47afa2973cbca9e3d38c16f40ff336919f961802c4a3a5e39c767138"}, -{"name":"nokogiri","version":"1.16.8","platform":"x64-mingw32","checksum":"861e2d7f24b0c7f5ea2a26e6d99af7e727d7641f0eab27b9b6c51b8a0666c805"}, -{"name":"nokogiri","version":"1.16.8","platform":"x86-linux","checksum":"f97760e6320166d48234029bed9e999521a888376bd2b7e04f4c054537154f16"}, -{"name":"nokogiri","version":"1.16.8","platform":"x86-mingw32","checksum":"ea48d7415b89f5dd3ff5a8f82bb2ec56fdc3431444381143fe90bb418eb9ea35"}, -{"name":"nokogiri","version":"1.16.8","platform":"x86_64-darwin","checksum":"6c40d7dc444f752634bf6ee8b53a55c3cfca3f9df52be46b8abcc559ccd49e47"}, -{"name":"nokogiri","version":"1.16.8","platform":"x86_64-linux","checksum":"ed7b1f80713ac968dd93fe2b96fc3df6e448b73bd02dd77d5fc89ba92a1ed6d9"}, +{"name":"nokogiri","version":"1.18.2","platform":"aarch64-linux-gnu","checksum":"74e0f9a7487a30a2957f46c5113d58f836436b033c9906e0bc6fee9d8cdafabf"}, +{"name":"nokogiri","version":"1.18.2","platform":"aarch64-linux-musl","checksum":"99bcea596a80eaee99f2bae2596275641ea688262c1da32b4e90db6159e86477"}, +{"name":"nokogiri","version":"1.18.2","platform":"arm-linux-gnu","checksum":"6fb0246b69f2c589a69254e82bc2a40aa238c4f977fd7903e283341a92935729"}, +{"name":"nokogiri","version":"1.18.2","platform":"arm-linux-musl","checksum":"dcdd4d10ed2743f0d8c887825700c3a8506aea1aa415917ac50ccc01597c51a3"}, +{"name":"nokogiri","version":"1.18.2","platform":"arm64-darwin","checksum":"8288ec7a296e2510ca9bd053c0c5989f11260f8c07bc3e9afbafa536f7077281"}, +{"name":"nokogiri","version":"1.18.2","platform":"java","checksum":"eefdf9f0d6086173d3488cf7a736732ee13fb6674ef15643478c20502a67bf37"}, +{"name":"nokogiri","version":"1.18.2","platform":"ruby","checksum":"93791cfb33186fe077eb9e1b8a6855b5621e328f81f565334572fa398366f8bf"}, +{"name":"nokogiri","version":"1.18.2","platform":"x64-mingw-ucrt","checksum":"894514572fa7503ce9210e51a7f8a9a35f34f154d6406cec1ac148c3ce1536a3"}, +{"name":"nokogiri","version":"1.18.2","platform":"x86_64-darwin","checksum":"7fca165e5ee87e9b6b3f1377180376afc0c8652ed2a3d761f472f0e3d3a1c651"}, +{"name":"nokogiri","version":"1.18.2","platform":"x86_64-linux-gnu","checksum":"9330ced4a976604865c2a76ce158e2bc608fa83999552e85a32ec06f85f427db"}, +{"name":"nokogiri","version":"1.18.2","platform":"x86_64-linux-musl","checksum":"1cd7786ed15c76958d6a8f9a864df6208fecd624c340eb4ed211fbea60328f02"}, {"name":"notiffany","version":"0.1.3","platform":"ruby","checksum":"d37669605b7f8dcb04e004e6373e2a780b98c776f8eb503ac9578557d7808738"}, {"name":"numerizer","version":"0.2.0","platform":"ruby","checksum":"e58076d5ee5370417b7e52d9cb25836d62acd1b8d9a194c308707986c1705d7b"}, {"name":"oauth","version":"0.5.6","platform":"ruby","checksum":"4085fe28e0c5e2434135e00a6555294fd2a4ff96a98d1bdecdcd619fc6368dff"}, @@ -536,8 +536,8 @@ {"name":"pry-byebug","version":"3.10.1","platform":"ruby","checksum":"c8f975c32255bfdb29e151f5532130be64ff3d0042dc858d0907e849125581f8"}, {"name":"pry-rails","version":"0.3.9","platform":"ruby","checksum":"468662575abb6b67f4a9831219f99290d5eae7bf186e64dd810d0a3e4a8cc4b1"}, {"name":"pry-shell","version":"0.6.4","platform":"ruby","checksum":"ad024882d29912b071a7de65ebea538b242d2dc1498c60c7c2352ef94769f208"}, -{"name":"psych","version":"5.2.2","platform":"java","checksum":"dae010e0bbc01e03da5c42cf538705759fb592f42eb9e06baf9bce932c2d7c4e"}, -{"name":"psych","version":"5.2.2","platform":"ruby","checksum":"a4a9477c85d3e858086c38cf64e7096abe40d1b1eed248b01020dec0ff9906ab"}, +{"name":"psych","version":"5.2.3","platform":"java","checksum":"3e5425b9e8a2f41cc2707d5ef14fdc1ae908abbafb12fe45727bd63900056585"}, +{"name":"psych","version":"5.2.3","platform":"ruby","checksum":"84a54bb952d14604fea22d99938348814678782f58b12648fcdfa4d2fce859ee"}, {"name":"public_suffix","version":"6.0.1","platform":"ruby","checksum":"61d44e1cab5cbbbe5b31068481cf16976dd0dc1b6b07bd95617ef8c5e3e00c6f"}, {"name":"puma","version":"6.5.0","platform":"java","checksum":"a58eea585d291aa33796add9884208bc1591da5d8e61886f8ac74d080b298c40"}, {"name":"puma","version":"6.5.0","platform":"ruby","checksum":"94d1b75cab7f356d52e4f1b17b9040a090889b341dbeee6ee3703f441dc189f2"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 9c9c0f31a32..8321548f5c2 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -1217,7 +1217,7 @@ GEM netrc (0.11.0) nio4r (2.7.0) no_proxy_fix (0.1.2) - nokogiri (1.16.8) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -1484,7 +1484,7 @@ GEM pry (>= 0.13.0) tty-markdown tty-prompt - psych (5.2.2) + psych (5.2.3) date stringio public_suffix (6.0.1) @@ -2219,7 +2219,7 @@ DEPENDENCIES net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) - nokogiri (~> 1.16) + nokogiri (~> 1.18) oauth2 (~> 2.0) octokit (~> 9.0) ohai (~> 18.1) diff --git a/doc/ci/runners/hosted_runners/linux.md b/doc/ci/runners/hosted_runners/linux.md index a0d80246ecb..8ae8a38d0f6 100644 --- a/doc/ci/runners/hosted_runners/linux.md +++ b/doc/ci/runners/hosted_runners/linux.md @@ -40,6 +40,12 @@ GitLab offers the following machine type for hosted runners on Linux Arm64. | `saas-linux-medium-arm64` (Premium and Ultimate only) | 4 | 16 GB | 50 GB | | `saas-linux-large-arm64` (Premium and Ultimate only) | 8 | 32 GB | 100 GB | +NOTE: +Users can experience network connectivity issues when they use Docker-in-Docker with hosted runners on Linux +Arm. This issue occurs when the maximum transmission unit (MTU) value in Google Cloud and Docker don't match. +To resolve this issue, set `--mtu=1400` in the client side Docker configuration. +For more details, see [issue 473739](https://gitlab.com/gitlab-org/gitlab/-/issues/473739#workaround). + ## Container images As runners on Linux are using the `docker+machine` [executor](https://docs.gitlab.com/runner/executors/#docker-machine-executor),