Merge commit from fork

This commit is contained in:
Claire 2025-12-08 15:44:08 +01:00 committed by GitHub
parent a9f8268a75
commit e6d2fc869b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 16 additions and 16 deletions

View file

@ -34,7 +34,7 @@ class MediaController < ApplicationController
def verify_permitted_status!
authorize @media_attachment.status, :show?
rescue Mastodon::NotPermittedError
rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
not_found
end