diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.checksum | 13 | ||||
| -rw-r--r-- | Gemfile.lock | 7 | ||||
| -rw-r--r-- | qa/gdk/Dockerfile.gdk | 2 |
4 files changed, 17 insertions, 7 deletions
@@ -254,7 +254,7 @@ gem 'rainbow', '~> 3.0' gem 'ruby-progressbar', '~> 1.10' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.7.0' +gem 're2', '2.0.0.beta2' # Misc diff --git a/Gemfile.checksum b/Gemfile.checksum index d87b57c74a6..12001e1583a 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -357,7 +357,7 @@ {"name":"mini_histogram","version":"0.3.1","platform":"ruby","checksum":"6a114b504e4618b0e076cc672996036870f7cc6f16b8e5c25c0c637726d2dd94"}, {"name":"mini_magick","version":"4.10.1","platform":"ruby","checksum":"e939d2c70c8002233fc6b1eecfe762f38a156d69ad31a87160205870be08f852"}, {"name":"mini_mime","version":"1.1.2","platform":"ruby","checksum":"a54aec0cc7438a03a850adb00daca2bdb60747f839e28186994df057cea87151"}, -{"name":"mini_portile2","version":"2.8.2","platform":"ruby","checksum":"46b2d244cc6ff01a89bf61274690c09fdbdca47a84ae9eac39039e81231aee7c"}, +{"name":"mini_portile2","version":"2.8.4","platform":"ruby","checksum":"180bc4193701bbeb9b6c02df5a6b8185bff7f32abd466dd97d6532d36e45b20a"}, {"name":"minitest","version":"5.11.3","platform":"ruby","checksum":"78e18aa2c49c58e9bc53c54a0b900e87ad0a96394e92fbbfa58d3ff860a68f45"}, {"name":"mixlib-cli","version":"2.1.8","platform":"ruby","checksum":"e6f27be34d580f6ed71731ca46b967e57793a627131c1f6e1ed2dad39ea3bdf9"}, {"name":"mixlib-config","version":"3.0.9","platform":"ruby","checksum":"9867adab3ab547eb74a8efdc9dfab6bcc83d2802a571ff8af8d6e981ca8d53ab"}, @@ -493,7 +493,16 @@ {"name":"rbtree","version":"0.4.6","platform":"ruby","checksum":"14eea4469b24fd2472542e5f3eb105d6344c8ccf36f0b56d55fdcfeb4e0f10fc"}, {"name":"rchardet","version":"1.8.0","platform":"ruby","checksum":"693acd5253d5ade81a51940697955f6dd4bb2f0d245bda76a8e23deec70a52c7"}, {"name":"rdoc","version":"6.3.2","platform":"ruby","checksum":"def4a720235c27d56c176ae73555e647eb04ea58a8bbaa927f8f9f79de7805a6"}, -{"name":"re2","version":"1.7.0","platform":"ruby","checksum":"0ccf19e3b289e67b56bd89a542488075de98d9b101b9946c4133d4b96af4d903"}, +{"name":"re2","version":"2.0.0.beta2","platform":"aarch64-linux","checksum":"7fdd52a0f5a17f626b55ee1edfdababe3e9e4648e5335e677138baad2cd6f180"}, +{"name":"re2","version":"2.0.0.beta2","platform":"arm-linux","checksum":"47339c3b6bd70b8c2707e2a762d770b1e22c039d736e758f44b44060339f3048"}, +{"name":"re2","version":"2.0.0.beta2","platform":"arm64-darwin","checksum":"8ab3b332c131f419e85698b4251868001ec828f6b98bfa268af55a750ba73ee0"}, +{"name":"re2","version":"2.0.0.beta2","platform":"ruby","checksum":"eb08108fe7f94c63e6dc6e15ad1148d53b6d6610b833724f98672d79cc2cca5d"}, +{"name":"re2","version":"2.0.0.beta2","platform":"x64-mingw-ucrt","checksum":"b0dd168a7446589c55168fe4d91e020e8667f660c1096458f852614052f6c6c5"}, +{"name":"re2","version":"2.0.0.beta2","platform":"x64-mingw32","checksum":"d98baf20f3e9b073d8c9841341260587a6491487bd03970f226e251aa3c79722"}, +{"name":"re2","version":"2.0.0.beta2","platform":"x86-linux","checksum":"97ea8c700aa673c49c7c6aad7ea1ec23ca77a3c02be99f8a756e2557e54051f3"}, +{"name":"re2","version":"2.0.0.beta2","platform":"x86-mingw32","checksum":"6700ad5427f68f8245e9be1d3fe35cd7a93779d68bc15bb95f720ebea472e6b4"}, +{"name":"re2","version":"2.0.0.beta2","platform":"x86_64-darwin","checksum":"ea4c9ae704241f10f983229c1911b66f5a3cf7de5c443f37d0d17eb56e7e5f73"}, +{"name":"re2","version":"2.0.0.beta2","platform":"x86_64-linux","checksum":"da8352f05430c96f9b662a29c8bbe991a9e5cf154752add5a96fb19d7c0df4b9"}, {"name":"recaptcha","version":"5.12.3","platform":"ruby","checksum":"37d1894add9e70a54d0c6c7f0ecbeedffbfa7d075acfbd4c509818dfdebdb7ee"}, {"name":"recursive-open-struct","version":"1.1.3","platform":"ruby","checksum":"a3538a72552fcebcd0ada657bdff313641a4a5fbc482c08cfb9a65acb1c9de5a"}, {"name":"redcarpet","version":"3.6.0","platform":"ruby","checksum":"8ad1889c0355ff4c47174af14edd06d62f45a326da1da6e8a121d59bdcd2e9e9"}, diff --git a/Gemfile.lock b/Gemfile.lock index cf94510e923..d593779d52f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1014,7 +1014,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.1.2) - mini_portile2 (2.8.2) + mini_portile2 (2.8.4) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -1293,7 +1293,8 @@ GEM rbtree (0.4.6) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.7.0) + re2 (2.0.0.beta2) + mini_portile2 (~> 2.8.4) recaptcha (5.12.3) json recursive-open-struct (1.1.3) @@ -1955,7 +1956,7 @@ DEPENDENCIES rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.7.0) + re2 (= 2.0.0.beta2) recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk index 0926883d00f..ce57e08cc90 100644 --- a/qa/gdk/Dockerfile.gdk +++ b/qa/gdk/Dockerfile.gdk @@ -1,4 +1,4 @@ -FROM registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:14fa752a80df21f840fc48f4be8561bee21b78886ac718652582fdd788d34c32 +FROM registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:fb833ce8f838e38104ee3b499a99f86e7a5844a4d4d8fdeeababd2d717504f3e as base ENV GITLAB_LICENSE_MODE=test \ GDK_KILL_CONFIRM=true |