catstodon/app
Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.
2023-01-14 22:34:09 +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-14 22:34:09 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
javascript [Glitch] Remove hardcoded width from dropdown overlays 2023-01-12 17:48:10 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +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-14 22:34:09 +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-12 10:15:46 +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-14 22:34:09 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00