Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

This commit is contained in:
Jenkins
2018-06-12 13:17:21 +00:00
58 changed files with 837 additions and 188 deletions

View File

@@ -11,7 +11,7 @@ class Settings::FollowerDomainsController < Settings::BaseController
def update
domains = bulk_params[:select] || []
SoftBlockDomainFollowersWorker.push_bulk(domains) do |domain|
AfterAccountDomainBlockWorker.push_bulk(domains) do |domain|
[current_account.id, domain]
end