forked from fedi/mastodon
Fix wrong HTTP status codes on error pages
This commit is contained in:
parent
8c7277acd4
commit
08b96f1b9f
|
@ -56,6 +56,6 @@ class AccountsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def check_account_suspension
|
def check_account_suspension
|
||||||
head 410 if @account.suspended?
|
gone if @account.suspended?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -51,21 +51,21 @@ class ApplicationController < ActionController::Base
|
||||||
def not_found
|
def not_found
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.any { head 404 }
|
format.any { head 404 }
|
||||||
format.html { render 'errors/404', layout: 'error' }
|
format.html { render 'errors/404', layout: 'error', status: 404 }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def gone
|
def gone
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.any { head 410 }
|
format.any { head 410 }
|
||||||
format.html { render 'errors/410', layout: 'error' }
|
format.html { render 'errors/410', layout: 'error', status: 410 }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def unprocessable_entity
|
def unprocessable_entity
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.any { head 422 }
|
format.any { head 422 }
|
||||||
format.html { render 'errors/422', layout: 'error' }
|
format.html { render 'errors/422', layout: 'error', status: 422 }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,6 @@ class StreamEntriesController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def check_account_suspension
|
def check_account_suspension
|
||||||
head 410 if @account.suspended?
|
gone if @account.suspended?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue