nyastodon/app
Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
2023-03-05 20:46:56 +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-05 20:46:56 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +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-05 20:46:56 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Remove unused InstancePresenter#sample_accounts method (#23900) 2023-02-27 19:03:35 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +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-05 20:46:56 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00