You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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.
1 year ago
..
chewy Change algorithm of `tootctl search deploy` to improve performance (#18463) 2 years ago
controllers Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
helpers Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
javascript Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
lib Fix unbounded recursion in account discovery (#1994) 1 year ago
mailers Add support for language preferences for trending statuses and links (#18288) 2 years ago
models Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
policies Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
presenters Change sign-in banner to reflect disabled or moved account status (#19773) 2 years ago
serializers Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
services Fix unbounded recursion in account discovery (#1994) 1 year ago
validators Fix various issues with domain block import (#1944) 2 years ago
views Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
workers Merge branch 'main' into glitch-soc/merge-upstream 2 years ago