glitchier-soc/app
Claire 341b653578 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05 14:16:25 +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-01-05 14:16:25 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
mailers Add single splat to callback method definitions to avoid ArgumentError (#22246) 2022-12-13 20:03:16 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Add follow request banner on account header (#20785) 2022-12-15 18:50:11 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00