From 9596f432505a8282473b5a011eaaa5de6fa101ef Mon Sep 17 00:00:00 2001 From: David Rodríguez Date: Sat, 8 Jun 2019 21:30:30 +0200 Subject: [bundler/bundler] Migrate two more requires to be relative https://github.com/bundler/bundler/commit/80217bfe0b --- lib/bundler.rb | 2 +- lib/bundler/vendored_thor.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bundler.rb b/lib/bundler.rb index d8f9462c6d..735750f59d 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -564,7 +564,7 @@ EOF private def eval_yaml_gemspec(path, contents) - Kernel.send(:require, "bundler/psyched_yaml") + require_relative "bundler/psyched_yaml" # If the YAML is invalid, Syck raises an ArgumentError, and Psych # raises a Psych::SyntaxError. See psyched_yaml.rb for more info. diff --git a/lib/bundler/vendored_thor.rb b/lib/bundler/vendored_thor.rb index b0b7e7be84..0666cfc9b9 100644 --- a/lib/bundler/vendored_thor.rb +++ b/lib/bundler/vendored_thor.rb @@ -2,7 +2,7 @@ module Bundler def self.require_thor_actions - Kernel.send(:require, "bundler/vendor/thor/lib/thor/actions") + require_relative "vendor/thor/lib/thor/actions" end end require_relative "vendor/thor/lib/thor" -- cgit v1.2.3