diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-26 22:32:21 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-26 22:32:21 +0100 |
commit | ad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a (patch) | |
tree | 70af45c80f67391c46c55425c64b33da9467fedb /app/services/fan_out_on_write_service.rb | |
parent | 58930199379305e718d57b48488cc752b452e72a (diff) | |
parent | 166cc5b89d60f8e2e1f748df86ff8a9003a4876e (diff) |
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'.
Diffstat (limited to 'app/services/fan_out_on_write_service.rb')
-rw-r--r-- | app/services/fan_out_on_write_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 169a2411d..09497e89f 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -127,7 +127,7 @@ class FanOutOnWriteService < BaseService end def update? - @is_update + @options[:update] end def broadcastable? |