aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-10-05 15:33:59 -0300
committerEmilio Tagua <miloops@gmail.com>2009-10-05 15:33:59 -0300
commit97aba353c80d3a55f79f9d280035be566c3bc0ef (patch)
tree7915c7a2986f48f166ded4277e637bedf4ef1a4f /actionpack/lib/action_controller
parent23c168a4fdd5a8f2191283d1d5c626c348fb6ae0 (diff)
parent570f055c44a0b6da973f63689f8fedbef9fe32d3 (diff)
downloadrails-97aba353c80d3a55f79f9d280035be566c3bc0ef.tar.gz
rails-97aba353c80d3a55f79f9d280035be566c3bc0ef.tar.bz2
rails-97aba353c80d3a55f79f9d280035be566c3bc0ef.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/dispatch/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb
index e04da42637..008fb54715 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
+ Rails.application.new
end
end
end