summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-02-07 11:45:25 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-02-07 11:45:25 +0000
commit98cbbdf7f1fac34b45f261584813538c60b047e0 (patch)
tree7c3bc882c7937e2e896930a4b05beb7a5d6ab096 /app/controllers
parent3d64938adcd4dd9372c0a47aa4f03b065d088279 (diff)
downloadredmine-98cbbdf7f1fac34b45f261584813538c60b047e0.tar.gz
redmine-98cbbdf7f1fac34b45f261584813538c60b047e0.zip
Reverts r12855.
git-svn-id: http://svn.redmine.org/redmine/trunk@12856 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8060c9e96..b297aa738 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -431,10 +431,6 @@ class ApplicationController < ActionController::Base
format.html {
render :template => 'common/error', :layout => use_layout, :status => @status
}
- format.js {
- # Can't use an error status here, browsers wouldn't execute the JS response
- render :template => 'common/error', :layout => false, :status => 200
- }
format.any { head @status }
end
end