Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `config/environments/production.rb`:
  Upstream changed a header but we had different default headers.
  Applied the same change, and also dropped HSTS headers redundant with
  Rails'.
This commit is contained in:
Claire
2022-01-26 22:32:21 +01:00
10 changed files with 263 additions and 215 deletions

View File

@@ -127,7 +127,7 @@ class FanOutOnWriteService < BaseService
end
def update?
@is_update
@options[:update]
end
def broadcastable?