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
b5b84fad65
Fix OpenSearch compatibility issue ( #30278 )
2024-05-14 17:54:28 +00:00
f35ba6963d
Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
d09b02efb6
Group Ruby OTEL packages in Renovate PRs ( #30242 )
2024-05-10 16:33:10 +00:00
0d397db5dd
Consolidate system specs into single directory, use rspec tags for configuration ( #30206 )
2024-05-10 12:36:09 +00:00
5a3062f723
Pass the CodeCov token from the secret to the action ( #30219 )
2024-05-10 08:00:02 +00:00
3789d9f825
Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
Switched to using upstream's implementation of the tests.
2024-05-04 16:28:30 +02:00
a76980a229
Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream
2024-05-04 15:40:07 +02:00
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
b7902225d6
Use built-in github annotation output for `stylelint` ( #30165 )
2024-05-03 14:56:48 +00:00
eeefb7cdbc
Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream
2024-05-01 19:42:34 +02:00
6204d13a2e
Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
There was an extra newline in glitch-soc for some reason.
Removed it.
2024-05-01 19:38:34 +02:00
946bd2e7e1
Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
6f342a6d4c
Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict caused by our different theme systems.
Ported upstream's changes.
- `app/models/account.rb`:
Upstream basically made a change we already made.
Moved constant declaration to match upstream.
2024-05-01 18:56:48 +02:00
00aec2f33a
Update peter-evans/create-pull-request action to v6.0.5 ( #30112 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-29 08:10:20 +00:00
7201f99cf8
Change default ruby version to 3.3.1 ( #28013 )
2024-04-29 07:41:59 +00:00
88f946890d
Update peter-evans/create-pull-request action to v6.0.4 ( #30025 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-22 08:13:28 +00:00
013671f29f
Rename JS testing section in GH Actions config ( #29931 )
2024-04-17 10:23:07 +00:00
828299e71c
Enable AR Encryption ( #29831 )
2024-04-17 09:19:02 +00:00
1549e6a9dc
Drop support for Ruby 3.0 (reaching EOL) ( #29702 )
2024-04-15 10:19:23 +00:00
e3dd60cce1
Update peter-evans/create-pull-request action to v6.0.3 ( #29946 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-15 07:26:57 +00:00
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
142c018cfa
Add ruby 3.3 to CI test matrix ( #29705 )
2024-03-21 21:48:41 +00:00
Claire