luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix wrong HTTP status codes on error pages

Browse source
This commit is contained in:
Eugen Rochko 2017-03-19 20:03:28 +01:00
parent 8c7277acd4
commit 08b96f1b9f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View file

@ -56,6 +56,6 @@ class AccountsController < ApplicationController
end
def check_account_suspension
head 410 if @account.suspended?
gone if @account.suspended?
end
end

6
app/controllers/application_controller.rb
View file

@ -51,21 +51,21 @@ class ApplicationController < ActionController::Base
def not_found
respond_to do |format|
format.any { head 404 }
format.html { render 'errors/404', layout: 'error' }
format.html { render 'errors/404', layout: 'error', status: 404 }
end
end
def gone
respond_to do |format|
format.any { head 410 }
format.html { render 'errors/410', layout: 'error' }
format.html { render 'errors/410', layout: 'error', status: 410 }
end
end
def unprocessable_entity
respond_to do |format|
format.any { head 422 }
format.html { render 'errors/422', layout: 'error' }
format.html { render 'errors/422', layout: 'error', status: 422 }
end
end

2
app/controllers/stream_entries_controller.rb
View file

@ -50,6 +50,6 @@ class StreamEntriesController < ApplicationController
end
def check_account_suspension
head 410 if @account.suspended?
gone if @account.suspended?
end
end