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

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

diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index caadd51213ed9cd1af4bd0224f87967a32fc2e31..605403348a07ecacc543ae4c9ecfdc2eabe759ab 100644 (file)
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -3,6 +3,15 @@ class ErrorsController < ApplicationController
 
   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
     respond_to do |format|
       format.html { render :status => :forbidden }