29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
ebf09328d4
Disable codecov github annotations ( #31783 )
2024-09-06 10:58:53 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
850478dc14
Use `conflicted` configuration for renovate rebase strategy ( #31770 )
2024-09-05 14:41:14 +00:00
5f8f8cc98f
Fix crowdin upload workflow not running on glitch-soc ( #2830 )
2024-08-31 17:33:06 +02:00
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
6eba057e64
Cache rspec persistence file between CI runs ( #31065 )
2024-08-27 15:23:08 +00:00
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
963c1309a4
Cache asset compilation results on CI ( #30868 )
2024-08-26 15:20:05 +00:00
f5d26225ed
Re-enable PR-needs-rebase action for glitch-soc (was disabled upstream for forks)
2024-08-24 12:33:09 +02:00
117af5847a
Disable tagging nightly images as latest
2024-08-24 12:32:48 +02:00
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
feaf2f2437
Update renovate config to fix #31379 ( #31408 )
2024-08-14 06:53:12 +00:00
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
2e85167188
Only run PR rebase needed check on non-fork repos ( #31401 )
2024-08-13 21:37:26 +00:00
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
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
7e33583daa
Dont run crowdin upload workflow on forks ( #31195 )
2024-07-29 17:19:05 +00:00
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
f1300ad284
Rename jobs/attachments rspec tag names ( #29762 )
2024-07-08 16:01:08 +00:00
79b0e192d9
Move test migrations paths check to workflow level ( #30702 )
2024-07-08 08:16:00 +00:00
1d35626dc7
Limit CI push triggers to `main` and `stable-*` branches ( #30934 )
2024-07-07 09:39:31 +00:00
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
f6390c3326
Use flatware to parallelize CI specs ( #30284 )
2024-06-27 07:42:57 +00:00
21ca03581a
Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream
2024-06-24 19:39:42 +02:00
39d80e84be
Remove `lockfileMaintenance` setting ( #30799 )
2024-06-24 14:47:14 +00:00
52e34a6bd6
Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream
2024-06-19 11:59:06 +02:00
8098d27f84
Stop calling Webpacker in full-stack tests ( #30763 )
2024-06-19 09:31:30 +00:00
556d409780
Enable renovate `lockFileMaintenance` setting ( #30732 )
2024-06-19 09:08:04 +00:00
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
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
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
2b10b0e027
Reduce docker service container health check wait times ( #30703 )
2024-06-14 15:49:08 +00:00
a66f6e1005
Add binstub for `brakeman` ( #30493 )
2024-06-13 15:07:02 +00:00
271a8e99e2
Update merge conflict rebase action version (silences node version warning) ( #30690 )
2024-06-13 14:37:49 +00:00
3a191b3797
Add `rubocop` binstub, simplify configuration ( #30407 )
2024-06-13 14:27:17 +00:00
8889816a51
Use stock ruby environment on CI lint tasks ( #30657 )
2024-06-13 13:23:32 +00:00
3b7c50abca
Remove bundler-audit ignore config ( #30672 )
2024-06-13 13:15:32 +00:00
47f97e113a
Update the bundler-audit vulnerability DB when running ( #30658 )
2024-06-12 11:39:16 +00:00
9321a454de
Combine CI migration tests ( #30661 )
2024-06-12 11:38:20 +00:00
cec8e34b25
Remove unused CI env vars ( #30660 )
2024-06-11 20:29:00 +00:00
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
0e1110c947
Use `SECRET_KEY_BASE_DUMMY` feature as placeholder during asset compilation ( #30505 )
2024-06-10 20:08:04 +00:00
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
f0f144e96d
Add `customManagers:dockerfileVersions` to renovate.json5 ( #30607 )
2024-06-10 14:47:59 +00:00
82fcb55680
Fix crowdin upload workflow not triggering on glitch-soc source string changes
2024-06-08 13:49:02 +02:00
c1a84f1b5b
Case correction `Github` -> `GitHub` ( #30446 )
...
Co-authored-by: Igor <igordsmelo@gmail.com>
2024-06-08 10:32:39 +00:00
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
5f15a892fa
Add support for libvips in addition to ImageMagick ( #30090 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
666760f450
Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream fixed a command we have modified in glitch-soc.
Updated as upstream did.
2024-05-14 20:47:14 +02:00
Claire