CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
23,576 Commits 1 Branch 1 Tag 344 MiB
b013067027
Commit Graph

391 Commits

Author SHA1 Message Date
Claire
f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00
Matt Jankowski
b231c3c1bf
Drop support for ruby 3.1 (#32363) 2024-10-31 15:12:08 +00:00
Claire
8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 2024-10-26 13:38:07 +02:00
renovate[bot]
36f1ec164d
Update dependency ubuntu to v24 (#32280) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:29:23 +00:00
Claire
6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
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.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 2024-10-19 19:13:32 +02:00
Claire
f8ba2122f8
Explicitly install ImageMagick in CI (except for libvips tests) (#32534) 2024-10-16 08:03:35 +00:00
Christian Winther
5900c8c7fd
Run migration tests against postgres 16 and 17 as well (#32416) 2024-10-16 07:44:28 +00:00
Renaud Chaput
a1eb1a9642
Update issue templates ot use the new GH Types, and add Troubleshooting template (#32484) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2024-10-15 11:49:15 +00:00
Claire
4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Claire
e15befebbd
Add tag with commit hash to PR image builds (#32418) 2024-10-11 14:16:37 +00:00
Claire
0d91db3d77
Fix latest tag for 4.3 docker image builds (#32350) 2024-10-09 12:13:32 +00:00
Claire
7033b3476e
Fix discrepancy with upstream regarding latest docker image tag (#2877) 2024-10-08 19:10:59 +02:00
Claire
1de6d511f4 Fix download of stable translation files in glitch-soc 2024-10-08 13:41:40 +02:00
Claire
562105c69a
Fix source strings being uploaded to crowdin in merge groups (#32298) 2024-10-08 08:00:05 +00:00
Claire
b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
renovate[bot]
d9973f3b70
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-01 08:28:50 +00:00
Claire
07cd1fd1ef
Support translation branches in Crowdin (#32174) 2024-09-30 17:32:23 +00:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Claire
4ffaced8bc
Second attempt at disabling Codecov annotations (#31841) 2024-09-10 14:00:23 +00: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
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
Claire
ebf09328d4
Disable codecov github annotations (#31783) 2024-09-06 10:58:53 +00:00
Claire
1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
Matt Jankowski
850478dc14
Use conflicted configuration for renovate rebase strategy (#31770) 2024-09-05 14:41:14 +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
Renaud Chaput
feaf2f2437
Update renovate config to fix #31379 (#31408) 2024-08-14 06:53:12 +00: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
21ca03581a Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream 2024-06-24 19:39:42 +02:00
Matt Jankowski
39d80e84be
Remove lockfileMaintenance setting (#30799) 2024-06-24 14:47:14 +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
Matt Jankowski
556d409780
Enable renovate lockFileMaintenance setting (#30732) 2024-06-19 09:08:04 +00:00