diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-06-03 18:01:11 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-06-03 18:01:11 +0100 |
commit | af003d8cd5909e1c7e1827d70f9ed7dd9586d738 (patch) | |
tree | ac56038a4361b812850865f4f11e7020f280462d /app/controllers/application_controller.rb | |
parent | e30a8623a1706d3bad4476198085547d8f47cc88 (diff) | |
parent | 9a4b220be62dcaceee45c70316c1a58a92abcfc5 (diff) |
Merge branch 'hotfix/0.11.0.1' into release/0.110.11.0.1
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 2615b61f2..d1d702616 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? |