diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-22 01:29:18 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-22 01:29:18 +0200 |
| commit | 919eb200a9a0969c444b938d08eb4661d41ba986 (patch) | |
| tree | 329cbe815d549275cc0dc6aa0f75c18d8954f105 /railties/lib/rails/application.rb | |
| parent | 56669ec3048de316918ec5ad554fff83d757911b (diff) | |
| parent | b456877cfb7e0cb0bab9ffd5674abd23caba0ab4 (diff) | |
| download | rails-919eb200a9a0969c444b938d08eb4661d41ba986.tar.gz rails-919eb200a9a0969c444b938d08eb4661d41ba986.tar.bz2 rails-919eb200a9a0969c444b938d08eb4661d41ba986.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 458177b954..3f9bca0bd6 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -149,6 +149,13 @@ module Rails self end + def load_console(sandbox=false) + initialize_console(sandbox) + railties.all { |r| r.load_console } + super() + self + end + def app @app ||= begin config.middleware = config.middleware.merge_into(default_middleware_stack) @@ -212,5 +219,11 @@ module Rails def initialize_generators require "rails/generators" end + + def initialize_console(sandbox=false) + require "rails/console/app" + require "rails/console/sandbox" if sandbox + require "rails/console/helpers" + end end end |