diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-07-01 19:23:14 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-01 19:23:14 +0200 |
commit | 45deca65b3fb8e9f19818e3db7d315cab0572d1a (patch) | |
tree | 1b9bab6ec764e8a6600d245595facd5694287e16 /app/models/home_feed.rb | |
parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
parent | 6d23d40420e4548778f3ca4ed9e8cb16e0eb0073 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.
Diffstat (limited to 'app/models/home_feed.rb')
-rw-r--r-- | app/models/home_feed.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/home_feed.rb b/app/models/home_feed.rb index 1fd506138..0fe9dae46 100644 --- a/app/models/home_feed.rb +++ b/app/models/home_feed.rb @@ -8,6 +8,6 @@ class HomeFeed < Feed end def regenerating? - redis.exists("account:#{@id}:regeneration") + redis.exists?("account:#{@id}:regeneration") end end |