diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-23 22:53:26 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-23 22:53:26 +0100 |
| commit | f915f9e33903ee474920e24ad12a1625f2ef1c52 (patch) | |
| tree | 5b6d41e8a809aeaadbc2c0be59603f5f58b16231 /railties/test/application | |
| parent | b17e358e3df34c03019e357f693611618092e1d6 (diff) | |
| parent | 8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff) | |
| download | rails-f915f9e33903ee474920e24ad12a1625f2ef1c52.tar.gz rails-f915f9e33903ee474920e24ad12a1625f2ef1c52.tar.bz2 rails-f915f9e33903ee474920e24ad12a1625f2ef1c52.zip | |
Merge branch 'master' into app
Conflicts:
railties/lib/rails/application.rb
Diffstat (limited to 'railties/test/application')
| -rw-r--r-- | railties/test/application/middleware_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index 8c4247e840..31696598ce 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -76,7 +76,7 @@ module ApplicationTests end def middleware - AppTemplate::Application.instance.middleware.active.map(&:klass).map(&:name) + AppTemplate::Application.middleware.active.map(&:klass).map(&:name) end end end |