~cytrogen/masto-fe

ref: b2d67fbe339d4852c97cd332a92a2c32b8835cdb masto-fe/app/models d---------
abdb5884 — Claire 2 years ago
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
bd810391 — Essem 2 years ago
Properly remove tIME chunk from PNG uploads (#27111)

1bd7455d — Claire 2 years ago
Fix inefficient queries in “Follows and followers” as well as several admin pages (#27116)

39da3d86 — Claire 2 years ago
Fix ActiveRecord using two connection pools when no replica is defined (#27061)

743fede5 — Claire 2 years ago
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
dfc05ec8 — Claire 2 years ago
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
5ed72f66 — Claire 2 years ago
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
5d8c65f2 — Claire 2 years ago
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
e4f5114a — Claire 2 years ago
Fix obsolete cache key in status cache invalidation logic (#26934)

fc682505 — Eugen Rochko 2 years ago
Change score half-life for trending posts from 2 hours to 1 hour (#26915)

20666482 — Robert R George 2 years ago
Added admin api for managing tags (#26872)

81caafbe — Claire 2 years ago
Fix performances of profile directory (#26842)

355e3fb5 — Claire 2 years ago
Simplify `Account.by_recent_status` and `Account.by_recent_sign_in` scopes (#26840)

8a9d7aeb — Colette Kerr 2 years ago
Change DCT method used for JPEG encoding to float (#26675)

b83e4875 — Claire 2 years ago
Fix moderator rights inconsistencies (#26729)

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

Merge upstream changes
77caba37 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
cab4cbfa — Claire 2 years ago
Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793)

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

Merge upstream changes into glitch-soc
Next