aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorTeng Siong Ong <siong1987@gmail.com>2010-02-28 02:21:12 -0600
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-02 21:56:37 -0800
commiteca46e3102399dc15f0462188e129e1ee25bd69f (patch)
tree73ac99a7c1e0a51767ec5759323943e88deedaef /railties/lib/rails
parent6193be26ce49bc24d67eb97f2f5f49c86f9f6bb7 (diff)
downloadrails-eca46e3102399dc15f0462188e129e1ee25bd69f.tar.gz
rails-eca46e3102399dc15f0462188e129e1ee25bd69f.tar.bz2
rails-eca46e3102399dc15f0462188e129e1ee25bd69f.zip
Use non-deprecated Rails.application instead of ActionController::Dispatcher.new and ActionDispatch::Integration instead of ActionController::Integration for console.
[#4072 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/console/app.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index 4959e18e33..4a7701081b 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -17,8 +17,8 @@ end
# create a new session. If a block is given, the new session will be yielded
# to the block before being returned.
def new_session
- app = ActionController::Dispatcher.new
- session = ActionController::Integration::Session.new(app)
+ app = Rails.application
+ session = ActionDispatch::Integration::Session.new(app)
yield session if block_given?
session
end