tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,104 Commits 5 Branches 0 Tags
Commit Graph

424 Commits

Author SHA1 Message Date
Claire
487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
 2026-05-22 19:43:42 +02:00
David Roetzel
dfcfef38af
Update to ruby 4.0.5 (#39099) 2026-05-21 11:45:36 +00:00
Claire
0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.
 2026-05-19 20:40:57 +02:00
renovate[bot]
b36c121a53
Update github/codeql-action digest to 9e0d7b8 (#38981) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-19 07:18:08 +00:00
Matt Jankowski
c3afdb760c
Remove references to deleted lint config files (#39033) 2026-05-19 07:11:43 +00:00
renovate[bot]
40f5533990
Update peter-evans/create-pull-request digest to 5f6978f (#38982) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-19 07:07:26 +00:00
Claire
42ec9a607b Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream 2026-05-18 19:35:08 +02:00
Matt Jankowski
75024a1778
Use ruby version 4.0.4 (#39016) 2026-05-18 10:08:22 +00:00
Claire
808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
Matt Jankowski
13fbf00a97
Update codecov-action to v6 (#39019) 2026-05-13 14:48:51 +00:00
Claire
4fcc9b8a40 Merge commit 'd2f640272f3f36c8979cff645416682840528906' into glitch-soc/merge-upstream 2026-05-12 18:37:31 +02:00
Michael Stanclift
cb5c5432b3
Narrow scope of Docker build cache in Github workflows (#39014) 2026-05-12 16:16:55 +00:00
Matt Jankowski
a547dfff37
Move flatware setup into rails_helper (#38944) 2026-05-12 13:12:49 +00:00
renovate[bot]
c3a1e04692
Update dorny/paths-filter digest to d1c1ffe (#38886) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-11 06:47:22 +00:00
Claire
49310aeecf Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream 2026-05-06 21:00:32 +02:00
renovate[bot]
0f753038c4
Update github/codeql-action digest to e46ed2c (#38887) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-06 13:17:26 +00:00
renovate[bot]
1e3b089eb6
Update docker/build-push-action digest to 10e90e3 (#38815) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-06 09:53:28 +00:00
Claire
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
renovate[bot]
d4e60dae9a
Update codecov/codecov-action digest to 75cd116 (#38747) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-30 09:25:22 +00:00
renovate[bot]
8456616793
Update actions/cache digest to 27d5ce7 (#38746) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-30 09:24:55 +00:00
renovate[bot]
bd17c48ef9
Update dependency ruby to v4.0.3 (#38765) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-28 13:30:20 +00:00
Claire
57017329a4 Merge commit '2dd630bc581dfd73950b45f6c3b1f47619b7ea6c' into glitch-soc/merge-upstream 2026-04-27 20:18:51 +02:00
renovate[bot]
45221070cc
Update crowdin/github-action digest to 8868a33 (#38814) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-27 07:53:04 +00:00
Claire
9177a3e807 Merge commit '02deb0b2381e116b512a826064f6d4008c260cd5' into glitch-soc/merge-upstream 2026-04-13 19:12:08 +02:00
renovate[bot]
96c8eeba49
Update actions/cache digest to 6682284 (#38482) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-13 15:14:36 +00:00
Claire
da85a16692 Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-soc/merge-upstream 2026-04-04 09:31:50 +02:00
Matt Jankowski
83ac8979c2
Use rubocop --format github instead of problem matcher (#38519) 2026-04-03 08:44:57 +00:00
Claire
b5c1a13341 Merge commit '30275cd80e8552d6cbcdeb11f83a4d5028aa6eae' into glitch-soc/merge-upstream 2026-04-01 18:37:21 +02:00
Matt Jankowski
52df641172
Use ruby version 4.0.2 (#37445) 2026-03-30 10:21:36 +00:00
Claire
79958d9442 Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.
 2026-03-25 21:36:32 +01:00
Matt Jankowski
31abef8917
Remove archive screenshots step from search CI job (#38403) 2026-03-25 16:37:02 +00:00
Matt Jankowski
2112ea4d63
Drop support for ruby 3.2 (#37476) 2026-03-25 13:18:34 +00:00
Claire
208b556c18 Merge commit '377952703cf70f14008cc7938479558d8cca9903' into glitch-soc/merge-upstream 2026-03-12 19:03:08 +01:00
Nicholas La Roux
21a8ff5351
Upgrade from Ruby 3.4.8 to 3.4.9 (#38154) 2026-03-12 14:04:35 +00:00
Claire
753e4bee8d Merge commit 'a70079968c55891e387b1c1e524bb314b9dfb033' into glitch-soc/merge-upstream 2026-03-04 18:40:39 +01:00
Matt Jankowski
43b0113a4a
Update ES versions in CI/devcontainer to match primary compose (#38041) 2026-03-04 15:33:25 +00:00
Claire
e3cb4dea42 Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream 2026-02-25 19:11:22 +01:00
Matt Jankowski
32873e63cf
Remove references to removed prettier config files (#37962) 2026-02-25 14:13:32 +00:00
Claire
3508c8b2f6 Merge commit 'ef6405ab28e02686c0c9aa69d77eb43909be5f6f' into glitch-soc/merge-upstream 2026-02-23 18:20:47 +01:00
Matt Jankowski
1d513966bd
Remove unneeded haml-lint problem matcher (#37930) 2026-02-23 09:54:50 +00:00
Claire
d7d102e68f Merge commit 'e24737c612730fd865f62905484dbfa25b82d27e' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream removed it, replaced by `.oxfmtrc.json`.
  We had glitch-specific files in there.
  Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`.
- `config/formatjs-formatter.js`:
  Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different.
  Glitch-soc had extra code in there.
  Reformatted appropriately.
- `eslint.config.mjs`:
  Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where
  glitch-soc had slightly different configuration.
  Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly.
- `package.json`:
  Upstream changed script definitions textually adjacent to one that we have modified.
  Applied upstream's change, keeping the textually adjacent modified script intact.
 2026-02-20 20:32:58 +01:00
Renaud Chaput
e24737c612
Replace prettier with oxfmt (#37893) 2026-02-19 18:04:25 +00:00
Claire
5769ceb6e3 Merge commit '284c53f4391c0e2cdea788bc0aff73190913a488' into glitch-soc/merge-upstream 2026-02-16 13:35:39 +01:00
Claire
284c53f439
Remove disabled bundlesize-compare workflow (#37875) 2026-02-16 09:51:24 +00:00
Claire
1b00b92772 Merge commit '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream 2026-02-10 12:03:53 +01:00
David Roetzel
0763ad0d96
Set a more explicit version number for GH Action (#37800) 2026-02-10 10:00:27 +00:00
Claire
8aabc8628d
Fix i18n check for missing source strings (#37801) 2026-02-10 09:56:16 +00:00
Claire
c8db60f8d2 Merge commit '0b8ce7200aa3121d07aa3866ddfc99de3bcf319e' into glitch-soc/merge-upstream 2026-02-09 21:45:21 +01:00
renovate[bot]
665f746165
Update artifact actions (major) (major) (#37788) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 15:06:12 +00:00
renovate[bot]
da91639b43
Update twk3/rollup-size-compare-action action to v1.2.0 (#37787) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-09 14:52:08 +00:00