diff options
| -rw-r--r-- | railties/configs/empty.log | 0 | ||||
| -rw-r--r-- | railties/lib/rails_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/base.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails_generator/options.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/railties/configs/empty.log b/railties/configs/empty.log new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/configs/empty.log diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index c46989819d..ed9b2d9636 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -23,7 +23,7 @@ $:.unshift(File.dirname(__FILE__)) -require 'rails_generator/support/core_ext' +require '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 92a54e2453..b8c926f3ce 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 File.dirname(__FILE__) + '/../support/class_attribute_accessors' +require File.dirname(__FILE__) + '/../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 54785413ef..4ddeb94887 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 File.dirname(__FILE__) + '/../support/class_inheritable_attributes' module Rails module Generator |