Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there.
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to 1cb978bcc3d291a045f367e072ca0af1a1c4dbbc
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
Add ability to delete avatar or header picture via the API (#25124) Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Allow setting a custom HTTP method in CacheBuster (#26528) Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
Fix cached posts including stale stats (#26409)
Merge pull request #2368 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to 496eb6f7a4fa7de54f26da9642a76e6884648102
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.
Merge pull request #2366 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to 3a4d3e9d4b573c400eec1743471d54cdccae50a5
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
Merge pull request #2365 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream up to 425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README
Avoid connecting to a running ES instance in ES search check spec (#26413)
Restore console behavior in `test` env (#26401)
Fix blocking subdomains of an already-blocked domain (#26392)
Fix list import concurrently creating lists of the same name (#26372)
Spec media attachment speedups (#25416)
Add alt text for preview card thumbnails (#26184)
Add `GET /api/v1/instance/languages` to REST API (#24443) Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)