mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Fix HTML error pages being returned when JSON is expected (#12713) 

Fix #12509
See also #12214
This commit is contained in:
Eugen Rochko 2019-12-30 04:38:18 +01:00 committed by GitHub
parent ca78b1473e
commit 353c94910b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

@ -136,6 +136,9 @@ class ApplicationController < ActionController::Base
end end
def respond_with_error(code) def respond_with_error(code)
render "errors/#{code}", layout: 'error', status: code, formats: [:html] respond_to do |format|
format.any { render "errors/#{code}", layout: 'error', status: code, formats: [:html] }
format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code }
end
end end
end end