catstodon/app
Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Upstream added lines close to a glitch-soc only line, not a real conflict.
  Applied upstream's changes (added hooks) while keeping glitch-soc's changes
  (`local_only` scope).
- `config/environments/production.rb`:
  Upstream removed a header, while we have glitch-soc specific ones.
  Removed the header removed upstream.
2023-03-22 19:50:11 +01: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 2023-03-22 19:50:11 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-18 11:21:03 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
mailers Add mail headers to avoid auto-replies (#23597) 2023-03-03 20:44:46 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Remove unused InstancePresenter methods (#24206) 2023-03-22 14:15:22 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2023-03-18 11:21:03 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00