Claire
198283a188
Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while
glitch-soc has a different version of the file overall.
Added upstream's changes.
2024-10-16 12:42:12 +02:00
Claire
36452845d7
Explicitly install ImageMagick in CI (except for libvips tests) ( #32534 )
2024-10-16 12:40:58 +02:00
Christian Winther
5c4bcd2f08
Run migration tests against postgres 16 and 17 as well ( #32416 )
2024-10-16 12:40:58 +02:00
Claire
b40adb4a89
Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3
2024-10-14 19:18:08 +02:00
Claire
f99da81ef8
Add tag with commit hash to PR image builds ( #32418 )
2024-10-14 13:14:38 +02:00
Claire
c0d3b3de10
Fix latest tag for 4.3 docker image builds ( #32350 )
2024-10-14 13:14:38 +02:00
Claire
e272cf5983
Fix download of stable translation files in glitch-soc
2024-10-08 13:42:57 +02:00
Claire
94c69bba25
Merge branch 'stable-4.3' into glitch-soc/backports-4.3
2024-10-08 13:19:29 +02:00
Claire
77ff94d3d2
Fix source strings being uploaded to crowdin in merge groups ( #32298 )
2024-10-08 10:10:50 +02:00
Claire
dfe851b476
Merge branch 'stable-4.3' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
2024-10-05 20:45:05 +02:00
renovate[bot]
6398d7b784
Update peter-evans/create-pull-request action to v7.0.5 ( #32164 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-04 17:48:03 +02:00
Claire
c8df7f4995
Change github action repo to glitch-soc
2024-09-30 20:50:32 +02:00
Claire
94743fea2c
Merge remote-tracking branch 'upstream/stable-4.3' into glitch-soc/stable-4.3
2024-09-30 20:49:42 +02:00
Claire
deee164acf
Support translation branches in Crowdin ( #32174 )
2024-09-30 19:45:40 +02:00
Claire
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
renovate[bot]
9d9901cc5b
Update peter-evans/create-pull-request action to v7 ( #31818 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-09 08:43:12 +00:00
Claire
5f8f8cc98f
Fix crowdin upload workflow not running on glitch-soc ( #2830 )
2024-08-31 17:33:06 +02:00
Claire
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
Matt Jankowski
6eba057e64
Cache rspec persistence file between CI runs ( #31065 )
2024-08-27 15:23:08 +00:00
Claire
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
Matt Jankowski
963c1309a4
Cache asset compilation results on CI ( #30868 )
2024-08-26 15:20:05 +00:00
Claire
f5d26225ed
Re-enable PR-needs-rebase action for glitch-soc (was disabled upstream for forks)
2024-08-24 12:33:09 +02:00
Claire
117af5847a
Disable tagging nightly images as latest
2024-08-24 12:32:48 +02:00
Claire
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
renovate[bot]
6bd7da72e9
Update crowdin/github-action action to v2 ( #31380 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-13 22:28:13 +00:00
Matt Jankowski
2e85167188
Only run PR rebase needed check on non-fork repos ( #31401 )
2024-08-13 21:37:26 +00:00
renovate[bot]
3a787d785c
Update docker/build-push-action action to v6 ( #31381 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-13 20:09:38 +00:00
Claire
1f796d129d
Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
Ported upstream changes.
2024-07-30 20:47:34 +02:00
Matt Jankowski
7e33583daa
Dont run crowdin upload workflow on forks ( #31195 )
2024-07-29 17:19:05 +00:00
Claire
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
Matt Jankowski
f1300ad284
Rename jobs/attachments rspec tag names ( #29762 )
2024-07-08 16:01:08 +00:00
Matt Jankowski
79b0e192d9
Move test migrations paths check to workflow level ( #30702 )
2024-07-08 08:16:00 +00:00
Matt Jankowski
1d35626dc7
Limit CI push triggers to main and stable-* branches ( #30934 )
2024-07-07 09:39:31 +00:00
Claire
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
Matt Jankowski
f6390c3326
Use flatware to parallelize CI specs ( #30284 )
2024-06-27 07:42:57 +00:00
Claire
52e34a6bd6
Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream
2024-06-19 11:59:06 +02:00
Claire
8098d27f84
Stop calling Webpacker in full-stack tests ( #30763 )
2024-06-19 09:31:30 +00:00
Claire
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
Claire
8089fa6935
Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's different theming system.
Ported upstream's change.
2024-06-17 18:14:14 +02:00
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Matt Jankowski
2b10b0e027
Reduce docker service container health check wait times ( #30703 )
2024-06-14 15:49:08 +00:00
Matt Jankowski
a66f6e1005
Add binstub for brakeman ( #30493 )
2024-06-13 15:07:02 +00:00
Matt Jankowski
271a8e99e2
Update merge conflict rebase action version (silences node version warning) ( #30690 )
2024-06-13 14:37:49 +00:00
Matt Jankowski
3a191b3797
Add rubocop binstub, simplify configuration ( #30407 )
2024-06-13 14:27:17 +00:00
Matt Jankowski
8889816a51
Use stock ruby environment on CI lint tasks ( #30657 )
2024-06-13 13:23:32 +00:00
Matt Jankowski
3b7c50abca
Remove bundler-audit ignore config ( #30672 )
2024-06-13 13:15:32 +00:00
Matt Jankowski
47f97e113a
Update the bundler-audit vulnerability DB when running ( #30658 )
2024-06-12 11:39:16 +00:00
Matt Jankowski
9321a454de
Combine CI migration tests ( #30661 )
2024-06-12 11:38:20 +00:00
Matt Jankowski
cec8e34b25
Remove unused CI env vars ( #30660 )
2024-06-11 20:29:00 +00:00
Claire
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
