Merge remote-tracking branch 'upstream/pull/5208'

[rails.git] / app / controllers / errors_controller.rb

diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index 465194ef93c461d8ec10be70dff917e4ba335818..605403348a07ecacc543ae4c9ecfdc2eabe759ab 100644 (file)
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -1,15 +1,35 @@
 class ErrorsController < ApplicationController
   layout "error"
 
 class ErrorsController < ApplicationController
   layout "error"
 

+  skip_authorization_check
+
+  before_action :set_locale
+
+  def bad_request
+    respond_to do |format|
+      format.html { render :status => :bad_request }
+      format.any { render :status => :bad_request, :plain => "" }
+    end
+  end
+

   def forbidden
   def forbidden

-    render :status => :forbidden
+    respond_to do |format|
+      format.html { render :status => :forbidden }
+      format.any { render :status => :forbidden, :plain => "" }
+    end

   end
 
   def not_found
   end
 
   def not_found

-    render :status => :not_found
+    respond_to do |format|
+      format.html { render :status => :not_found }
+      format.any { render :status => :not_found, :plain => "" }
+    end

   end
 
   def internal_server_error
   end
 
   def internal_server_error

-    render :status => :internal_server_error
+    respond_to do |format|
+      format.html { render :status => :internal_server_error }
+      format.any { render :status => :internal_server_error, :plain => "" }
+    end

   end
 end
   end
 end