diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-10-16 19:04:28 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-10-16 19:04:28 -0500 |
| commit | c1261b5484c10930be9f737abfc164f9ba072629 (patch) | |
| tree | 65e63de01ec16de8ddfe534c54bf637764195d41 /actionpack | |
| parent | d8594026962704b6b51e188a29406fbd22bb31ce (diff) | |
| download | rails-c1261b5484c10930be9f737abfc164f9ba072629.tar.gz rails-c1261b5484c10930be9f737abfc164f9ba072629.tar.bz2 rails-c1261b5484c10930be9f737abfc164f9ba072629.zip | |
Use Rails.application where we want a valid rack app
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/dispatch/dispatcher.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index 008fb54715..e04da42637 100644 --- a/actionpack/lib/action_controller/dispatch/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb @@ -50,7 +50,7 @@ module ActionController def new # DEPRECATE Rails application fallback - Rails.application.new + Rails.application end end end diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 58ebe94a5b..40d6f97b2a 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -490,7 +490,7 @@ module ActionDispatch def self.app # DEPRECATE Rails application fallback # This should be set by the initializer - @@app || (defined?(Rails.application) && Rails.application.new) || nil + @@app || (defined?(Rails.application) && Rails.application) || nil end def self.app=(app) |