diff options
| -rw-r--r-- | railties/lib/initializer.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/plugin/loader.rb (renamed from railties/lib/plugin/loader.rb) | 0 | ||||
| -rw-r--r-- | railties/lib/rails/plugin/locator.rb (renamed from railties/lib/plugin/locator.rb) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 4e4e260056..1e01758729 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -2,8 +2,8 @@ require 'logger' require 'set' require File.join(File.dirname(__FILE__), 'railties_path') require File.join(File.dirname(__FILE__), 'rails/version') -require File.join(File.dirname(__FILE__), 'plugin/locator') -require File.join(File.dirname(__FILE__), 'plugin/loader') +require File.join(File.dirname(__FILE__), 'rails/plugin/locator') +require File.join(File.dirname(__FILE__), 'rails/plugin/loader') RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV) diff --git a/railties/lib/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb index d5ad3aa8e3..d5ad3aa8e3 100644 --- a/railties/lib/plugin/loader.rb +++ b/railties/lib/rails/plugin/loader.rb diff --git a/railties/lib/plugin/locator.rb b/railties/lib/rails/plugin/locator.rb index 6c4f2605bb..6c4f2605bb 100644 --- a/railties/lib/plugin/locator.rb +++ b/railties/lib/rails/plugin/locator.rb |