diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-17 12:41:55 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-17 12:43:17 +0100 |
| commit | 27d9836ad3519d57462b86a4e539c1aa176b6d95 (patch) | |
| tree | 8a228e43b44285ab7fd3a63d8908fbe4469d3a1e /railties | |
| parent | 61ada28ed3cdc42efa6f9714e909231959b88c26 (diff) | |
| download | rails-27d9836ad3519d57462b86a4e539c1aa176b6d95.tar.gz rails-27d9836ad3519d57462b86a4e539c1aa176b6d95.tar.bz2 rails-27d9836ad3519d57462b86a4e539c1aa176b6d95.zip | |
Add ActionDispatch::Railties::Subscriber and finish tidying up the logging.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 4ded2515fc..0bc7160815 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -1,9 +1,8 @@ -require "pathname" +require 'pathname' require 'active_support' require 'active_support/core_ext/kernel/reporting' require 'active_support/core_ext/logger' -require 'action_dispatch' require 'rails/initializable' require 'rails/application' @@ -18,6 +17,8 @@ require 'rails/deprecation' require 'rails/subscriber' require 'rails/ruby_version_check' +require 'action_dispatch/railtie' + # For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the # multibyte safe operations. Plugin authors supporting other encodings # should override this behaviour and set the relevant +default_charset+ |