diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-04 15:12:36 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-04 15:12:36 +0100 |
| commit | 1d64718b8eb0fa63bcf6d3853f4bda7b15eb4427 (patch) | |
| tree | ae425fa3cebe8295af47d288898728c0d764b926 /app/controllers/application_controller.rb | |
| parent | 7b9fc0f82acfee43bc42a080f8a1e64c23604a65 (diff) | |
| parent | a919141992a40599f99b32bd4a8312a0009f3f7a (diff) | |
Merge branch 'release/0.11' into rails-3-develop
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3a1ec95cc..dffc16b63 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -142,7 +142,10 @@ class ApplicationController < ActionController::Base ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver @status = 500 end - render :template => "general/exception_caught", :status => @status + respond_to do |format| + format.html{ render :template => "general/exception_caught", :status => @status } + format.any{ render :nothing => true, :status => @status } + end end def local_request? |