diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:01:35 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:01:35 +0000 |
| commit | 8da8d4b043c37b53a69803c71ff36b478d4776d0 (patch) | |
| tree | 7c8cec15645e74f19c88e4eb5b210b96174c7d03 /lib/rubygems/core_ext/kernel_require.rb | |
| parent | c5cb386eba6d9a2d9a8e6ffa8c30137d0c4660c1 (diff) | |
| download | ruby-8da8d4b043c37b53a69803c71ff36b478d4776d0.tar.gz | |
Merge RubyGems 3.0.0.beta1.
* It drop to support < Ruby 2.2
* Cleanup deprecated methods and classes.
* Mark obsoleted methods to deprecate.
* and other enhancements.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/core_ext/kernel_require.rb')
| -rwxr-xr-x | lib/rubygems/core_ext/kernel_require.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index d3df9d85f9..e93cd7c728 100755 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -11,13 +11,8 @@ module Kernel RUBYGEMS_ACTIVATION_MONITOR = Monitor.new # :nodoc: - if defined?(gem_original_require) then - # Ruby ships with a custom_require, override its require - remove_method :require - else - ## - # The Kernel#require from before RubyGems was loaded. - + # Make sure we have a reference to Ruby's original Kernel#require + unless defined?(gem_original_require) alias gem_original_require require private :gem_original_require end |