diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-28 11:36:56 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-28 11:36:56 +0100 |
| commit | 3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce (patch) | |
| tree | cd86abce0ab9accbbbf24018961464590fa6bb39 /railties/lib/rails/rack.rb | |
| parent | 5db2f199aba9aa8d00adefa8237922ad684aca03 (diff) | |
| parent | 96c6fe084228d570dad80e3100830edb2bc0448d (diff) | |
| download | rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.tar.gz rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.tar.bz2 rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/callbacks.rb
activeresource/lib/active_resource/base.rb
Diffstat (limited to 'railties/lib/rails/rack.rb')
| -rw-r--r-- | railties/lib/rails/rack.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb index abcd0741bf..b4f32c2d95 100644 --- a/railties/lib/rails/rack.rb +++ b/railties/lib/rails/rack.rb @@ -1,5 +1,6 @@ module Rails module Rack + autoload :Logger, "rails/rack/logger" autoload :Static, "rails/rack/static" end end |