diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-09 11:30:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 11:30:28 +0100 |
| commit | 67125534bc0fd48a45d6cb17a5c78712d8e87150 (patch) | |
| tree | b718c8b54a0bd63eab69abaef2267c8f0aa9a9b9 /app/services/unblock_domain_service.rb | |
| parent | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (diff) | |
| parent | ecd83f495c18486bc7ea901423f6fccfd910b277 (diff) | |
Merge pull request #1454 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/unblock_domain_service.rb')
| -rw-r--r-- | app/services/unblock_domain_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb index d502d9e49..e765fb7a8 100644 --- a/app/services/unblock_domain_service.rb +++ b/app/services/unblock_domain_service.rb @@ -13,6 +13,6 @@ class UnblockDomainService < BaseService scope = Account.by_domain_and_subdomains(domain_block.domain) scope.where(silenced_at: domain_block.created_at).in_batches.update_all(silenced_at: nil) unless domain_block.noop? - scope.where(suspended_at: domain_block.created_at).in_batches.update_all(suspended_at: nil) if domain_block.suspend? + scope.where(suspended_at: domain_block.created_at).in_batches.update_all(suspended_at: nil, suspension_origin: nil) if domain_block.suspend? end end |