aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-25 01:06:12 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-25 01:12:22 +0100
commit3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f (patch)
treeacd1fdb20cd5a63e6867c2befb07de8f46ab66ec /railties/lib/rails.rb
parent396003fc48d7c0ba206ad059646c7414bee22a36 (diff)
downloadrails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.tar.gz
rails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.tar.bz2
rails-3b6f659fb6b1ffd323c0bbad36630cc97b96bd5f.zip
Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config.
Diffstat (limited to 'railties/lib/rails.rb')
-rw-r--r--railties/lib/rails.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 623555e7c1..b7a39fd5a7 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -10,6 +10,7 @@ require 'rails/deprecation'
require 'rails/subscriber'
require 'rails/ruby_version_check'
+require 'active_support/railtie'
require 'action_dispatch/railtie'
# For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the