Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 18:13:30 -05:00
parent 99b2bc2668 f6bb50b6ec
commit 5cff053944
62 changed files with 868 additions and 195 deletions
--- a/app/controllers/settings/follower_domains_controller.rb
+++ b/app/controllers/settings/follower_domains_controller.rb
@@ -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