mastodon/db
Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.
2022-01-23 18:24:01 +01:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
views Remove IP tracking columns from users table () 2022-01-16 13:23:50 +01:00
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
seeds.rb Change unconfirmed user login behaviour () 2019-07-22 10:48:50 +02:00