diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-19 11:41:02 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-23 14:49:04 -0700 |
commit | 30baaac5465a352e78dac6330407a7b3460db180 (patch) | |
tree | 3d7dcd5687ce9f6bc6727d06f5a460d978a1c156 /railties/lib | |
parent | 9cfd1d44915f4615bbb760198cd01bf4dfc69f5a (diff) | |
download | rails-30baaac5465a352e78dac6330407a7b3460db180.tar.gz rails-30baaac5465a352e78dac6330407a7b3460db180.tar.bz2 rails-30baaac5465a352e78dac6330407a7b3460db180.zip |
Fix the default frameworks
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/initializer.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 3adc3b9ce5..37bec7a272 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -1,4 +1,8 @@ require "pathname" +require 'railties_path' +require 'rails/version' +require 'rails/gem_dependency' +require 'rails/rack' module Rails class Configuration @@ -12,9 +16,9 @@ module Rails @framework_paths = [] @load_once_paths = [] @after_initialize_blocks = [] - @frameworks = [] @plugin_paths = [] @loaded_plugins = [] + @frameworks = default_frameworks @plugin_loader = default_plugin_loader @plugin_locators = default_plugin_locators @gems = default_gems @@ -46,6 +50,10 @@ module Rails ActionController::Dispatcher.middleware end + def default_frameworks + [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ] + end + def default_plugin_loader require 'rails/plugin/loader' Plugin::Loader |