mastodon/db
Claire 8391d975d7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.
2021-08-09 23:25:49 +02:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
views Improve performance of follow recommendation scheduler (#16159) 2021-05-05 22:04:52 +02:00
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00