glitchier-soc/app
Claire 525919c04f Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2022-10-30 18:15:28 +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 2022-10-30 18:15:28 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
mailers Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
presenters Fix remote account in contact account setting not being used (#19351) 2022-10-21 14:07:02 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00