~cytrogen/masto-fe

ref: 53f5b27bd10e5f471b59cd0597d67ea12587c95a masto-fe/app/lib d---------
53f5b27b — Claire 2 years ago
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
ac237077 — Claire 2 years ago
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream

Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
74c27e33 — Claire 2 years ago
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
a5dbb1ee — Claire 2 years ago
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
3262d1f1 — Claire 2 years ago
Fix incorrect serialization of regional languages in `contentMap` (#27207)

3171afc3 — Michael Stanclift 2 years ago
Add Elasticsearch index size to Admin dashboard (#27301)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3c13d706 — Claire 2 years ago
Add mention of YJIT in admin dashboard if enabled (#27283)

2f8f92df — Matt Jankowski 2 years ago
Fix Elastic check deprecation warning about gem version (#27262)

ceb365c4 — Claire 2 years ago
Fix boosts of local users being filtered in account timelines (#27204)

770fd993 — Jakob Gillich 2 years ago
Fix importer returning negative row estimates (#27258)

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

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698
abdb5884 — Claire 2 years ago
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
3de6dcf6 — Claire 2 years ago
Add redirection on `/deck` URLs for logged-out users (#27128)

4aaaf0dd — Renaud Chaput 2 years ago
Fix the search documentation URL in system checks (#27036)

57f47e50 — Claire 2 years ago
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f546b0c9 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
eeab3560 — Claire 2 years ago
Merge pull request from GHSA-v3xf-c9qf-j667

94893cf2 — Claire 2 years ago
Merge pull request from GHSA-hcqf-fw2r-52g4

* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285)"

This reverts commit 8891d8945d837f0da16a3a5aa2dc9783e39b0acd.

* Revert "Do not normalize URL before fetching it (#26219)"

This reverts commit fd284311e79854d6bc2901a9d9363ba9e7e00513.
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.
Next