Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 88c6e2d0988..37f938ea5e9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -592,3 +592,11 @@ gem 'app_store_connect'
 
 # For phone verification
 gem 'telesignenterprise', '~> 2.2'
+
+# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in
+# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2
+# Can be removed when support for Ruby 2 is dropped
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do
+  # BufferedIO patch
+  gem 'net-protocol', '~> 0.1.3'
+end