diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
commit | 3d25fe042679e7f5b9095983feb22f46e24c3033 (patch) | |
tree | 18b57e7abf4f3edf55f057efd6eb47da698bf0f6 /app/lib | |
parent | 2c8615fbf8f8085eb836733b27b33c9522c29c71 (diff) | |
parent | 0db101ede2eb9f8869932135785b0d83cd05560e (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.
Diffstat (limited to 'app/lib')
-rw-r--r-- | app/lib/feed_manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 7f2bc42d3..2c16689bd 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -549,7 +549,7 @@ class FeedManager end else # A reblog may reach earlier than the original status because of the - # delay of the worker deliverying the original status, the late addition + # delay of the worker delivering the original status, the late addition # by merging timelines, and other reasons. # If such a reblog already exists, just do not re-insert it into the feed. return false unless redis.zscore(reblog_key, status.id).nil? |