nyastodon/app
Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.
2022-12-07 09:03:42 +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 2022-12-07 09:03:42 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
lib Fix unbounded recursion in account discovery (#22025) 2022-12-07 00:15:24 +01:00
mailers Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Change sign-in banner to reflect disabled or moved account status (#19773) 2022-11-05 18:28:13 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
services Fix unbounded recursion in account discovery (#22025) 2022-12-07 00:15:24 +01:00
validators Fix various issues with domain block import (#1944) 2022-11-17 11:42:20 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-11-28 11:33:34 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00