ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
58918844a9
Update peter-evans/create-pull-request action to v6 ( #29167 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-12 10:20:54 +00:00
b2133fee5f
Update artifact preservation to use `save_path` value ( #29035 )
2024-02-07 13:37:10 +00:00
aaa58d4807
Fix tagging of manual security nightly builds ( #29061 )
2024-02-06 20:48:11 +00:00
779d987fbc
Update `codedoc/codecov-action` to v4 ( #29036 )
2024-02-06 09:34:28 +00:00
5bc39b3196
Fix build-security docker tags
2024-02-01 20:30:35 +01:00
c3936cbbe3
Temporary hack to correctly tag the security docker image…
2024-02-01 18:40:40 +01:00
970320d73c
Restore -streaming suffix for security builds ( #2602 )
2024-02-01 17:20:08 +01:00
63d7a30503
Fix build-security workflow for glitch-soc
2024-02-01 16:09:51 +01:00
a7b16003e1
Fix security builds not being marked latest
2024-02-01 11:31:29 +01:00
883f589653
Fix missing `workflow_dispatch` trigger for `build-security` ( #29041 )
2024-02-01 10:58:10 +01:00
7316a08380
Fix missing `workflow_dispatch` trigger for `build-security` ( #29041 )
2024-02-01 09:52:01 +00:00
85bdd145dc
Adapt workflow to glitch-soc
2024-02-01 10:40:04 +01:00
a48447a6b2
Add github action workflow for manual security builds ( #29040 )
2024-02-01 10:39:23 +01:00
812a131423
Add github action workflow for manual security builds ( #29040 )
2024-02-01 09:33:12 +00:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
ca7053f19c
Consolidate db test prep steps to rake task ( #28886 )
2024-01-25 13:10:39 +00:00
559bbf0aa6
chore(deps): update artifact actions (major) to v4 (major) ( #28415 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-24 16:51:18 +00:00
35b6583371
Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream
2023-12-29 17:40:57 +01:00
63901bb34b
Update github/codeql-action action to v3 ( #28495 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-29 10:22:43 +00:00
7b7b6d234b
Change mastodon-streaming nightly builds to be tagged as latest ( #2546 )
...
glitch-soc does not have releases, so it tags nightly container builds as latest; but we were not doing the same thing for the new `mastodon-streaming` container
2023-12-26 12:13:56 +01:00
f96e713522
Fix trying to push mastodon-streaming docker images to upstream's ghcr repo ( #2541 )
2023-12-22 13:01:08 +01:00
5bd61a3fc5
Don't try to push images to Mastodon's dockerhub ( #2540 )
2023-12-22 12:13:53 +01:00
d4c87ff5b8
Disable use of missing native arm64 docker builder for the streaming image ( #2539 )
2023-12-22 08:45:37 +01:00
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
8afd313807
Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
2023-12-19 20:06:32 +01:00
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
a80530d1df
Dockerfile rewrite based on Ruby image with performance optimizations and size reduction, dedicated Streaming image ( #26850 )
...
Co-authored-by: “Michael <“mx@vmstan.com>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
2023-11-28 10:04:40 +00:00
e892efbc40
Configure elastic search integration with rspec tag ( #27882 )
2023-11-17 11:52:20 +00:00
36d7d1781f
Add CodeCov for Ruby coverage reports ( #23868 )
2023-11-14 16:53:38 +00:00
9d799d40ba
Reduce CI job matrix job count ( #27660 )
2023-11-03 14:58:33 +00:00
5d9e71ebe0
Archive uploaded CI assets into single file between build/test ( #27668 )
2023-11-03 14:12:14 +00:00
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
2023-10-24 20:31:20 +02:00
6cf9f1211b
Create custom Github Actions for common steps ( #27518 )
2023-10-24 11:43:24 +00:00
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
510845b6b9
Only enable github-rspec for pull_request events ( #27456 )
2023-10-18 15:20:24 +02:00
e9dc30cdba
Fix duplicate github annotations for rspec failures ( #27450 )
2023-10-18 10:18:34 +02:00
0d18c47c18
Enable scheduled actions only on glitch-soc's repo
2023-10-17 22:03:54 +02:00
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
1fb4e40145
Run scheduled actions only on the main repo ( #27343 )
2023-10-17 14:59:39 +02:00
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
2023-10-08 17:05:40 +02:00
ad637eacd1
Add a test case for ES8 ( #27248 )
2023-10-03 10:48:32 +02:00
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
530f48610d
Update docker/setup-qemu-action action to v3 ( #27124 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:41:20 +02:00
cdd8c4eb2a
Update docker/setup-buildx-action action to v3 ( #27123 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:40:41 +02:00
8ea98aa384
Update docker/metadata-action action to v5 ( #27122 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:40:03 +02:00
19bc73b736
Update docker/login-action action to v3 ( #27121 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:39:14 +02:00
cf9230fa1c
Update docker/build-push-action action to v5 ( #27120 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:38:55 +02:00
Claire