~cytrogen/masto-fe

ref: f7a4d77d908e6de6ce823d13c9fac1b075d9f4f8 masto-fe/app/serializers d---------
ee02b10e — Claire 2 years ago
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes into glitch-soc
c107512f — Claire 2 years ago
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
ac2dae0d — Claire 2 years ago
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.
6b7c4731 — Claire 2 years ago
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
16681e0f — Claire 2 years ago
Add admin notifications for new Mastodon versions (#26582)

336ec503 — Tyler Deitz 2 years ago
Add avatar image to webfinger responses (#26558)

d847c206 — Claire 2 years ago
Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
b6b68b44 — Claire 2 years ago
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream

Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
30c191aa — jsgoldstein 2 years ago
Add new public status index (#26344)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
cf6f7079 — Robert R George 2 years ago
Add support for federating `memorial` attribute  (#26583)

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
120f5802 — CSDUMMI 2 years ago
Add direct link to the Single-Sign On provider if there is only one sign up method available (#26083)

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