nyastodon/db
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02: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-06-28 11:11:18 +02:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00