Claire 4e3c68e025 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream fixed an issue that glitch-soc did not have, in a place with
  glitch-soc changes to hide the number of followers.
  Kept glitch-soc's code.

2022-03-17 19:23:39 +01:00

..

migrate

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-17 19:23:39 +01:00

post_migrate

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-12 11:51:25 +01:00

views

Fix some old migration scripts (#17394)

2022-01-30 21:38:54 +01:00

schema.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-17 19:23:39 +01:00

seeds.rb

Change unconfirmed user login behaviour (#11375)

2019-07-22 10:48:50 +02:00