Merge tag 'v2.7.0' into instance_only_statuses

2019-01-22 11:56:24 +01:00
parent e8161a11fc 31e7940de5
commit 20ad8165a0
115 changed files with 2913 additions and 803 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -362,7 +362,8 @@ class User < ApplicationRecord
  end

  def regenerate_feed!
-    Redis.current.setnx("account:#{account_id}:regeneration", true) && Redis.current.expire("account:#{account_id}:regeneration", 1.day.seconds)
+    return unless Redis.current.setnx("account:#{account_id}:regeneration", true)
+    Redis.current.expire("account:#{account_id}:regeneration", 1.day.seconds)
    RegenerationWorker.perform_async(account_id)
  end