diff options
| -rw-r--r-- | activesupport/lib/active_support/mini.rb | 4 | ||||
| -rw-r--r-- | railties/lib/generators.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/mini.rb b/activesupport/lib/active_support/mini.rb index fe7ba48e58..b787650655 100644 --- a/activesupport/lib/active_support/mini.rb +++ b/activesupport/lib/active_support/mini.rb @@ -1,9 +1,9 @@ $LOAD_PATH.unshift File.dirname(__FILE__) -require "core_ext/blank" # whole object.rb pulls up rarely used introspection extensions +require "core_ext/object/blank" require "core_ext/object/metaclass" require 'core_ext/array' require 'core_ext/hash' require 'core_ext/module/attribute_accessors' -require 'core_ext/string/inflections'
\ No newline at end of file +require 'core_ext/string/inflections' diff --git a/railties/lib/generators.rb b/railties/lib/generators.rb index de751f61a1..dd61a686c2 100644 --- a/railties/lib/generators.rb +++ b/railties/lib/generators.rb @@ -2,11 +2,11 @@ activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" $:.unshift(activesupport_path) if File.directory?(activesupport_path) begin - require 'active_support/all' + require 'active_support/mini' rescue LoadError require 'rubygems' gem 'activesupport' - require 'active_support/all' + require 'active_support/mini' end $:.unshift(File.dirname(__FILE__)) |