Skip to content
Snippets Groups Projects
Commit 78281d582d8e authored by Andrew Patterson's avatar Andrew Patterson
Browse files

Merge branch 'drop-chef-net-http-patch' into 'master'

Drop the Chef warning about net/http patch for Ruby 3.1

Closes #8751

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7966



Merged-by: default avatarAndrew Patterson <apatterson@gitlab.com>
Approved-by: default avatarLucas Li <lli@gitlab.com>
Approved-by: default avatarAndrew Patterson <apatterson@gitlab.com>
Co-authored-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
1 merge request!161Merge upstream Omnibus GitLab into Omnibus Heptapod
diff --git a/lib/chef/monkey_patches/net-http.rb b/lib/chef/monkey_patches/net-http.rb
index 19fb9ab39d..7a34a67a32 100644
--- a/lib/chef/monkey_patches/net-http.rb
+++ b/lib/chef/monkey_patches/net-http.rb
@@ -122,6 +122,4 @@ if RUBY_VERSION.split(".")[0..1].join(".") == "3.1"
end
end
end
-else
- warn "Not applying net/http monkey patch needed for ruby 3.1"
end
......@@ -48,5 +48,8 @@
patch source: "utf8-locale-support.patch",
target: "#{gem_path}/gems/chef-config-#{version}/lib/chef-config/config.rb"
patch source: "drop-net-http-warning.patch",
target: "#{gem_path}/gems/chef-#{version}/lib/chef/monkey_patches/net-http.rb"
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment