diff options
author | Carl Lerche <carllerche@mac.com> | 2009-10-07 15:21:19 -0700 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2009-10-08 12:31:09 -0700 |
commit | 6d6ae0841c94d3c0ce0c91311028ff7396c44a4a (patch) | |
tree | 14030762454f1afffa747fc6202498353c0337d9 /railties/lib/rails/generators | |
parent | d0965892456e0ec76f9cb95a151d3b8e11622e36 (diff) | |
download | rails-6d6ae0841c94d3c0ce0c91311028ff7396c44a4a.tar.gz rails-6d6ae0841c94d3c0ce0c91311028ff7396c44a4a.tar.bz2 rails-6d6ae0841c94d3c0ce0c91311028ff7396c44a4a.zip |
Start moving the initializers into the application object
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index 52086fbc7d..6e0e2279cd 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -40,20 +40,20 @@ module Rails class Boot def run - load_initializer set_load_paths + load_initializer end def set_load_paths %w( - railties - railties/lib - activesupport/lib + actionmailer/lib actionpack/lib + activemodel/lib activerecord/lib - actionmailer/lib activeresource/lib - actionwebservice/lib + activesupport/lib + railties/lib + railties ).reverse_each do |path| path = "#{framework_root_path}/#{path}" $LOAD_PATH.unshift(path) if File.directory?(path) @@ -68,7 +68,6 @@ module Rails class VendorBoot < Boot def load_initializer - $:.unshift("#{framework_root_path}/railties/lib") require "rails" install_gem_spec_stubs Rails::GemDependency.add_frozen_gem_path |