~cytrogen/masto-fe

ref: a5dbb1ee5a59fd3d4f99a9b28ac3822546ac712f masto-fe/.github d---------
a5dbb1ee — Claire 2 years ago
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
ad637eac — jsgoldstein 2 years ago
Add a test case for ES8 (#27248)

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
530f4861 — renovate[bot] 2 years ago
Update docker/setup-qemu-action action to v3 (#27124)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
cdd8c4eb — renovate[bot] 2 years ago
Update docker/setup-buildx-action action to v3 (#27123)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
8ea98aa3 — renovate[bot] 2 years ago
Update docker/metadata-action action to v5 (#27122)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
19bc73b7 — renovate[bot] 2 years ago
Update docker/login-action action to v3 (#27121)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
cf9230fa — renovate[bot] 2 years ago
Update docker/build-push-action action to v5 (#27120)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
d0d06c99 — Claire 2 years ago
Merge pull request #2422 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
86ec1e83 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
4fcc026f — Claire 2 years ago
Bump version to v4.2.0 (#27017)

0cb343ee — Claire 2 years ago
Tag nightly images as `latest` in glitch-soc, as it has no proper releases (#2414)

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.
e193c848 — Claire 2 years ago
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
5d93e98d — Renaud Chaput 2 years ago
Fix container build when cache is disabled (#26932)

ef8ca2fd — Renaud Chaput 2 years ago
Change Dockerfile to upgrade packages when building (#26922)

3d0331fc — renovate[bot] 2 years ago
Update actions/checkout action to v4 (#26882)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Next