Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream moved things around in a place where glitch-soc had support for an extra parameter (`content_type`). Follow upstream but reintroduce `content_type`.
This commit is contained in:
@ -39,7 +39,7 @@ class StatusPolicy < ApplicationPolicy
|
||||
alias unreblog? destroy?
|
||||
|
||||
def update?
|
||||
staff?
|
||||
staff? || owned?
|
||||
end
|
||||
|
||||
private
|
||||
|
Reference in New Issue
Block a user