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

558 Commits

Author SHA1 Message Date
Claire
e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.
 2026-06-09 21:30:54 +02:00
Claire
4ee893461d
Change i18n unused strings check to only check English strings (#39347) 2026-06-09 14:17:36 +00:00
renovate[bot]
fba4775ef6
Update codecov/codecov-action digest to fb8b358 (#39322) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-09 12:32:41 +00:00
renovate[bot]
da1d731cb4
Update actions/checkout digest to df4cb1c (#39321) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-09 09:54:10 +00:00
Claire
c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
Matt Jankowski
085c91bf12
Reduce timeout minutes for actions (#39205) 2026-06-04 13:55:21 +00:00
Claire
3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
Essem
4d54d9867e
Fix container builds failing on repo names with uppercase characters (#39208) 2026-06-01 14:09:59 +00:00
Claire
83e77e88ae Merge commit '9215e1ec53dcf3714080c84af7af070bcb8d9978' into glitch-soc/merge-upstream 2026-05-27 20:04:47 +02:00
renovate[bot]
ed23fafd1d
Update codecov/codecov-action digest to e79a696 (#39155) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-27 15:39:38 +00:00
renovate[bot]
a5ea645268
Update github/codeql-action digest to 7211b7c (#39156) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-27 15:39:20 +00:00
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
Nicholas La Roux
630ad9fd49
Add libheif dependencies to setup-ruby action to unbreak media_attachment_spec.rb on latest pre-release yet rolled out runner image (#39052) 2026-05-18 06:23:20 +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
99f0a03dec Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream 2026-05-07 18:26:17 +02:00
Trivikram Kamat
27e90864ac
Globally install corepack (#34406) 2026-05-07 10:43:15 +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]
6dbad32d65
Update actions/setup-node digest to 48b55a0 (#38483) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-30 09:21:23 +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
Claire
b46d003e20
Don't install recommended packages in CI tasks (#38401) 2026-03-25 15:59:50 +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