Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: app/javascript/styles/mastodon/components.scss
2018-01-17 18:37:09 -06:00
parent aa2bf07281 7badad7797
commit 201e82686f
38 changed files with 419 additions and 60 deletions
@@ -3,5 +3,6 @@
 class PrecomputeFeedService < BaseService
  def call(account)
    FeedManager.instance.populate_feed(account)
+    Redis.current.del("account:#{account.id}:regeneration")
  end
 end