~cytrogen/masto-fe

ref: 53f5b27bd10e5f471b59cd0597d67ea12587c95a masto-fe/db d---------
c04b08a3 — Claire 2 years ago
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
b57ec6ad — Claire 2 years ago
Fix some settings not being properly migrated when set to `false`
f05985f8 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
890e3347 — Claire 2 years ago
Add migration tests for negative settings (#27012)

5efa6ac7 — Claire 2 years ago
Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
6a9e93ae — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
abcc0b38 — Claire 2 years ago
Fix incorrect PostgreSQL version check (#26979)

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

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
81caafbe — Claire 2 years ago
Fix performances of profile directory (#26842)

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)

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

Merge upstream changes
e66f961e — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
cddef4c4 — Claire 2 years ago
Fix language settings for users having selected the `kmr` language (#26787)

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.
16681e0f — Claire 2 years ago
Add admin notifications for new Mastodon versions (#26582)

Next