about summary refs log tree commit diff
path: root/app/services/unblock_domain_service.rb
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-07-25 21:36:22 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-07-25 21:36:22 +0200
commit7e5691804d4f0019a89b8b8a3dad532bc9d940ea (patch)
tree84c2f4e4ac07bea3915639a50df84eb62b6c5768 /app/services/unblock_domain_service.rb
parent852acbd7385a640d9e00e462d58a847851744034 (diff)
parent7232cdf7e8249f79078005931b1165e54e413fa9 (diff)
Merge git://github.com/tootsuite/mastodon into tootsuite-master
Diffstat (limited to 'app/services/unblock_domain_service.rb')
-rw-r--r--app/services/unblock_domain_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb
index 169d2f781..946b6d465 100644
--- a/app/services/unblock_domain_service.rb
+++ b/app/services/unblock_domain_service.rb
@@ -10,7 +10,7 @@ class UnblockDomainService < BaseService
   end
 
   def process_retroactive_updates
-    blocked_accounts.in_batches.update_all(update_options)
+    blocked_accounts.in_batches.update_all(update_options) unless domain_block.noop?
   end
 
   def blocked_accounts