summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 07:20:59 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 07:20:59 +0000
commit9e7993794f54d1f5ed17f87adf65e86df69647ae (patch)
tree65d6cb92322a9efc16e7d56668c19cc81a22b6e7 /lib
parentbcd3f7863757d75a7bd232e442fed038e0fdcff5 (diff)
* lib/rubygems/core_ext/kernel_require.rb: -I should always win over
gems. [ruby-core:74814] [Backport #12248] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rwxr-xr-xlib/rubygems/core_ext/kernel_require.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
index 8f2cddee4d..bf9618d3bf 100755
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ b/lib/rubygems/core_ext/kernel_require.rb
@@ -66,7 +66,7 @@ module Kernel
begin
RUBYGEMS_ACTIVATION_MONITOR.exit
- return gem_original_require(spec.to_fullpath(path) || path)
+ return gem_original_require(path)
end if spec
# Attempt to find +path+ in any unresolved gems...