~cytrogen/masto-fe

ref: fbfc4145fd815ec2aa3e8cbc70bb064e46461973 masto-fe/spec d---------
fbfc4145 — Claire 2 years ago
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.
8eb09466 — Claire 2 years ago
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 1cb978bcc3d291a045f367e072ca0af1a1c4dbbc
10404aec — Claire 2 years ago
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
d24a87ce — Daniel M Brasil 2 years ago
Add ability to delete avatar or header picture via the API (#25124)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
b95867ad — Renaud Chaput 2 years ago
Allow setting a custom HTTP method in CacheBuster (#26528)

Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
60b9fa64 — Claire 2 years ago
Fix cached posts including stale stats (#26409)

86ba8d3e — Claire 2 years ago
Merge pull request #2368 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 496eb6f7a4fa7de54f26da9642a76e6884648102
6530f970 — Claire 2 years ago
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
678fa1e6 — Claire 2 years ago
Merge pull request #2366 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 3a4d3e9d4b573c400eec1743471d54cdccae50a5
ea8802a0 — Claire 2 years ago
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
0dfc6ea3 — Claire 2 years ago
Merge pull request #2365 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream up to 425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa
44a5f1b6 — Claire 2 years ago
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
d9a93239 — Matt Jankowski 2 years ago
Avoid connecting to a running ES instance in ES search check spec (#26413)

2c883642 — Matt Jankowski 2 years ago
Restore console behavior in `test` env (#26401)

b12d75ef — Claire 2 years ago
Fix blocking subdomains of an already-blocked domain (#26392)

30c64bf6 — Claire 2 years ago
Fix list import concurrently creating lists of the same name (#26372)

c3639787 — Matt Jankowski 2 years ago
Spec media attachment speedups (#25416)

8da99ffb — Christian Schmidt 2 years ago
Add alt text for preview card thumbnails (#26184)

3a4d3e9d — Daniel M Brasil 2 years ago
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>
e258b4cb — Emelia Smith 2 years ago
Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

Next