mastodon/app
Claire 1b6a21e6bc Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/status_length_validator.rb`:
  Conflict due to glitch-soc's configurable maximum toot chars.
  Ported upstream changes.
2021-03-11 16:08:15 +01:00
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-03-02 12:06:58 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
javascript Fix various CodeClimate warnings 2021-03-06 14:51:53 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-03-11 16:08:15 +01:00
mailers Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-03-11 16:08:15 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-03-11 16:08:15 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-03-11 16:08:15 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00