Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 9f7f7601085..0d5e751a0ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -593,3 +593,7 @@ gem 'app_store_connect'
 
 # For phone verification
 gem 'telesignenterprise', '~> 2.2'
+
+# lib/gitlab/buffered_io.rb relies on the old net-protocols internals
+# and fails with >= 0.2.0 due to new rbuf_offset based optimizations
+gem 'net-protocol', '~> 0.1.2'
diff --git a/Gemfile.checksum b/Gemfile.checksum
index 4ccdddc27d4..f2f4077c43a 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -362,6 +362,7 @@
 {"name":"net-http-persistent","version":"4.0.1","platform":"ruby","checksum":"2752f4cce05fd1c45e0537c6f3a98fa5a4899efd5f88e63c104ed5f05cbddef9"},
 {"name":"net-ldap","version":"0.17.1","platform":"ruby","checksum":"52571b55f9157120833ac1667f2969ce0139251811d0a9b64657c1c135069cf9"},
 {"name":"net-ntp","version":"2.1.3","platform":"ruby","checksum":"5bc73f4102bde0d1872bd3b293608ae99d9f5007d744f21919c6a565eda9267d"},
+{"name":"net-protocol","version":"0.1.3","platform":"ruby","checksum":"ad43e2be965ede676683c047b2c3d76762aa49a764779d98312a10da04622c14"},
 {"name":"net-scp","version":"3.0.0","platform":"ruby","checksum":"8fc6c80365b95230c6bfc529dbea3893d2d81724855bfb01cbf385866e1c902c"},
 {"name":"net-ssh","version":"6.0.0","platform":"ruby","checksum":"6290ddcb232380cae79b772af924e12f57fe1dcd0f71254411dd21c04f7b13d0"},
 {"name":"netrc","version":"0.11.0","platform":"ruby","checksum":"de1ce33da8c99ab1d97871726cba75151113f117146becbe45aa85cb3dabee3f"},
@@ -604,6 +605,7 @@
 {"name":"thrift","version":"0.16.0","platform":"ruby","checksum":"d023286ea89e30444c9f1c28dd76107f87d8aaf85fe1742da1d8cd3b5417dcce"},
 {"name":"tilt","version":"2.0.11","platform":"ruby","checksum":"7b180fc472cbdeb186c85d31c0f2d1e61a2c0d77e1d9fd0ca28482a9d972d6a0"},
 {"name":"timeliness","version":"0.3.10","platform":"ruby","checksum":"c357233ce19dc53148e8b29dfddde134689f18f52b32928e9dfe12ebcf4a773f"},
+{"name":"timeout","version":"0.3.2","platform":"ruby","checksum":"269b765ea2fb052fc2bfb8d3be2c90d60fe1161f92bf971c91d6151b8a6bcddd"},
 {"name":"timfel-krb5-auth","version":"0.8.3","platform":"ruby","checksum":"ab388c9d747fa3cd95baf2cc1c03253e372d8c680adcc543670f4f099854bb80"},
 {"name":"tins","version":"1.31.1","platform":"ruby","checksum":"51c4a347c25c630d310cbc2c040ffb84e266c8227f2ade881f1130ee4f9fbecf"},
 {"name":"toml-rb","version":"2.2.0","platform":"ruby","checksum":"a1e2c54ac3cc9d49861004f75f0648b3622ac03a76abe105358c31553227d9a6"},
diff --git a/Gemfile.lock b/Gemfile.lock
index dced424b042..f190cf2e7c1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -945,6 +945,8 @@ GEM
       connection_pool (~> 2.2)
     net-ldap (0.17.1)
     net-ntp (2.1.3)
+    net-protocol (0.1.3)
+      timeout
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.0.0)
@@ -1466,6 +1468,7 @@ GEM
     thrift (0.16.0)
     tilt (2.0.11)
     timeliness (0.3.10)
+    timeout (0.3.2)
     timfel-krb5-auth (0.8.3)
     tins (1.31.1)
       sync
@@ -1758,6 +1761,7 @@ DEPENDENCIES
   multi_json (~> 1.14.1)
   net-ldap (~> 0.17.1)
   net-ntp
+  net-protocol (~> 0.1.2)
   nokogiri (~> 1.14.2)
   oauth2 (~> 2.0)
   octokit (~> 4.15)