mastodon/app
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
..
chewy Change algorithm of tootctl search deploy to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
mailers Prevent use locale with empty string (#18543) 2022-05-28 14:32:08 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
presenters Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00