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 /db/migrate | |
| 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 'db/migrate')
| -rw-r--r-- | db/migrate/20170920032311_fix_reblogs_in_feeds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb index 5654bf6f8..bcd4b9137 100644 --- a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb +++ b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb @@ -15,7 +15,7 @@ class FixReblogsInFeeds < ActiveRecord::Migration[5.1] # feed, with an entry in a reblog tracking zset (where the score # is once again set to the reblogging status' ID, and the value # is set to the reblogged status' ID). This is safe for Redis' - # float coersion because in this reblog tracking zset, we only + # float conversion because in this reblog tracking zset, we only # need the rebloggging status' ID to be able to stop tracking # entries after they have gotten too far down the feed, which # does not require an exact value. |