diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
| commit | 915f108d6a47b9c29e11ebe0b140ef017eb015b0 (patch) | |
| tree | ae0c42330a9fbdc8395f8a5bae4605ef455c18c1 /railties/lib/rails | |
| parent | aee63a12f2cfd110725c74686ae1eed58e18fda7 (diff) | |
| parent | b5dfdc714fab7d2836e0a979ca88b4a17db9ec06 (diff) | |
| download | rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.gz rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.bz2 rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index c48c989b18..fdb071fc18 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -93,7 +93,6 @@ module Rails # TODO: Fix this when there is an application object def middleware - require 'action_controller' ActionController::Dispatcher.middleware end |