Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-27 13:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,660 Commits 74 Branches 58 Tags
deed31ba8c954faa24ef532fdd445bc2efbbad88
Commit Graph

3124 Commits

Author SHA1 Message Date
Claire
deed31ba8c Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/public_feed.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
- `spec/models/tag_feed_spec.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
 2025-10-23 18:33:52 +02:00
renovate[bot]
92aeecfbdc Update dependency vite to v7.1.12 (#36573) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-23 08:41:34 +00:00
Claire
ee9a15031b Merge commit '9f7075a0ce2b6ecef8d92ef318785fa8ce708688' into glitch-soc/merge-upstream 2025-10-22 18:06:32 +02:00
renovate[bot]
c40648f7b3 Update dependency pino to v9.14.0 (#36529) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-22 13:53:20 +00:00
renovate[bot]
2bd5c2f528 Update dependency ioredis to v5.8.2 (#36544) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-22 13:52:59 +00:00
Claire
5674100f0b Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream 2025-10-21 15:57:43 +02:00
renovate[bot]
74172ced81 Update dependency playwright to v1.55.1 [SECURITY] (#36534) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-21 07:20:24 +00:00
Claire
9080083263 Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream 2025-10-20 21:37:50 +02:00
renovate[bot]
341ea7f462 Update dependency vite to v7.1.11 (#36526) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 17:07:28 +00:00
renovate[bot]
53e20d5c83 Update dependency jsdom to v27.0.1 (#36524) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 12:11:04 +00:00
renovate[bot]
0a1111d5a5 Update dependency @reduxjs/toolkit to v2.9.1 (#36515) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 12:10:45 +00:00
Claire
22e3c0e745 Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
 2025-10-17 19:00:18 +02:00
renovate[bot]
1018a4def4 Update dependency vite-plugin-static-copy to v3.1.4 (#36480) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-17 14:10:36 +00:00
Claire
323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.
 2025-10-16 19:23:29 +02:00
renovate[bot]
28339cad6d Update dependency rollup-plugin-visualizer to v6.0.5 (#36499) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-16 10:29:13 +00:00
Claire
ef413ef713 Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream 2025-10-15 16:35:37 +02:00
Matt Jankowski
c6de46d12d Update stylelint-config-standard-scss to version 16.0.0 (#36429) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-10-15 11:30:09 +00:00
renovate[bot]
3550508421 Update dependency core-js to v3.46.0 (#36417) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:55:10 +00:00
renovate[bot]
e3e5067772 Update formatjs monorepo (#36415) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:11:45 +00:00
renovate[bot]
5fd380096f Update dependency vite-plugin-pwa to v1.1.0 (#36452) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:10:52 +00:00
renovate[bot]
d788e45628 Update dependency vite to v7.1.10 (#36468) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:08:49 +00:00
Claire
f800057008 Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream 2025-10-08 18:07:04 +02:00
renovate[bot]
5c92312d4d Update dependency cross-env to v10.1.0 (#36297) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-08 14:19:27 +00:00
renovate[bot]
aa7bcd3ae3 Update formatjs monorepo (#36356) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-07 15:34:45 +00:00
Brad Dunbar
c578a0cb74 Resolve typescript eslint warning (#36314) 2025-10-07 14:42:15 +00:00
renovate[bot]
da6ae98e57 Update dependency ioredis to v5.8.1 (#36361) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-07 14:29:58 +00:00
renovate[bot]
fb6fd7b7e1 Update dependency pino to v9.13.1 (#36337) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-07 14:29:19 +00:00
renovate[bot]
d51717c101 Update dependency vite to v7.1.9 (#36332) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-07 14:29:04 +00:00
Claire
432af3c25d Merge commit '80c8a847409c73c4e9a086c8f398a984cf5c2137' into glitch-soc/merge-upstream 2025-10-04 14:22:26 +02:00
renovate[bot]
5543967e5c chore(deps): update dependency rollup-plugin-visualizer to v6.0.4 (#36336) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-03 07:57:48 +00:00
Claire
17e0c745c6 Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream 2025-10-01 19:13:18 +02:00
renovate[bot]
94a4e9d5a9 chore(deps): update dependency vite-plugin-static-copy to v3.1.3 (#36312) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-01 09:48:26 +00:00
Claire
b6c53c1129 Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Upstream refactored a part of the code where glitch-soc has changed the code
  to potentially hide followers count.
  Adapt upstream's changes.
 2025-09-29 18:41:46 +02:00
renovate[bot]
9f1a12b749 chore(deps): update dependency @vitejs/plugin-react to v5.0.4 (#36282) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-29 09:30:01 +00:00
renovate[bot]
bbb698937a chore(deps): update dependency pino to v9.12.0 (#36287) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-29 09:29:15 +00:00
Claire
8fad4926c5 Merge commit '1571514e49ec02a57c050612b3bca856f54933fb' into glitch-soc/merge-upstream 2025-09-27 21:29:19 +02:00
Claire
4053209a05 Merge commit '6d2493ca7c39a5d60edd7109de0c24256f8fff8c' into glitch-soc/merge-upstream 2025-09-25 18:44:23 +02:00
diondiondion
d801cf8e59 Replace react-router-scroll-4 with inlined implementation (#36253) 2025-09-25 12:26:50 +00:00
Renaud Chaput
719b2de3c3 Update uuid package to latest version (#36259) 2025-09-25 08:54:02 +00:00
renovate[bot]
507e6dc473 fix(deps): update dependency ioredis to v5.8.0 (#36234) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-25 07:58:20 +00:00
renovate[bot]
fda3589498 fix(deps): update dependency sass to v1.93.2 (#36231) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-25 07:55:09 +00:00
renovate[bot]
cc54b33720 chore(deps): update dependency typescript to ~5.9.0 (#36212) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-09-25 07:52:37 +00:00
Claire
a548c5c29b Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream 2025-09-23 18:41:09 +02:00
renovate[bot]
4b1d7490d2 chore(deps): update devdependencies (non-major) (#35889) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-22 15:45:24 +00:00
renovate[bot]
107d2a9f93 chore(deps): update playwright to v1.55.0 (#36222) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-22 15:38:59 +00:00
renovate[bot]
6c2c485638 chore(deps): update storybook (non-major) (#36221) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-09-22 15:01:03 +00:00
renovate[bot]
45a044cad0 fix(deps): update dependency debug to v4.4.3 (#36058) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-22 13:57:59 +00:00
renovate[bot]
91e666bcaa fix(deps): update dependency postcss-preset-env to v10.4.0 (#35873) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-22 13:54:38 +00:00
renovate[bot]
da272d13e2 fix(deps): update dependency react-swipeable-views to v0.14.1 (#36208) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-22 13:53:49 +00:00
renovate[bot]
28264c5c86 fix(deps): update dependency sass to v1.93.0 (#36199) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-22 13:52:52 +00:00