diff options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails_generator.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails_generator/base.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails_generator/options.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index ed9b2d9636..edfe86efc4 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -23,7 +23,8 @@ $:.unshift(File.dirname(__FILE__)) -require 'support/core_ext' +require 'active_support/core_ext' + require 'rails_generator/base' require 'rails_generator/lookup' diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb index b8c926f3ce..54b4b32fd3 100644 --- a/railties/lib/rails_generator/base.rb +++ b/railties/lib/rails_generator/base.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../support/class_attribute_accessors' -require File.dirname(__FILE__) + '/../support/inflector' +require 'active_support/class_attribute_accessors' +require 'active_support/inflector' require File.dirname(__FILE__) + '/options' require File.dirname(__FILE__) + '/manifest' require File.dirname(__FILE__) + '/spec' diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb index 4ddeb94887..80af7fedf9 100644 --- a/railties/lib/rails_generator/options.rb +++ b/railties/lib/rails_generator/options.rb @@ -1,5 +1,5 @@ require 'optparse' -require File.dirname(__FILE__) + '/../support/class_inheritable_attributes' +require 'active_support/class_inheritable_attributes' module Rails module Generator |