diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-22 07:19:39 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-22 07:19:39 -0800 |
| commit | 39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd (patch) | |
| tree | a593c0c51564e1f99e813d858312664eb76f6cf1 /actionpack/lib/action_controller/railtie.rb | |
| parent | 8cae31c800f281212c9c5b5ac0ea2be98c4aa611 (diff) | |
| parent | 3a1d51959bf569a7419fe8ab9416b338334b4800 (diff) | |
| download | rails-39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd.tar.gz rails-39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd.tar.bz2 rails-39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd.zip | |
Merge pull request #3717 from lest/show-exceptions-refactor
Show exceptions refactor: controller should be responsible for choice to show exceptions
Diffstat (limited to 'actionpack/lib/action_controller/railtie.rb')
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index f0c29825ba..de7b837ecc 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -21,6 +21,8 @@ module ActionController paths = app.config.paths options = app.config.action_controller + options.consider_all_requests_local ||= app.config.consider_all_requests_local + options.assets_dir ||= paths["public"].first options.javascripts_dir ||= paths["public/javascripts"].first options.stylesheets_dir ||= paths["public/stylesheets"].first |