Change to always returns html document in error pages (#12214)

mastodon · Nov 13, 2019 · afb398b · afb398b
1 parent 6c60cce
commit afb398b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -136,9 +136,6 @@ def current_theme
   end
 
   def respond_with_error(code)
-    respond_to do |format|
-      format.any  { head code }
-      format.html { render "errors/#{code}", layout: 'error', status: code }
-    end
+    render "errors/#{code}", layout: 'error', status: code
   end
 end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
@@ -22,11 +22,6 @@ def invalid_authenticity_token
   end
 
   shared_examples 'respond_with_error' do |code|
-    it "returns http #{code} for any" do
-      subject
-      expect(response).to have_http_status(code)
-    end
-
     it "returns http #{code} for http" do
       subject
       expect(response).to have_http_status(code)