Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
commit
ebc0521ba8
27 changed files with 266 additions and 59 deletions
|
@ -40,7 +40,6 @@ class RemoteInteractionController < ApplicationController
|
|||
@status = Status.find(params[:id])
|
||||
authorize @status, :show?
|
||||
rescue Mastodon::NotPermittedError
|
||||
# Reraise in order to get a 404
|
||||
raise ActiveRecord::RecordNotFound
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue