Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,309 Commits 74 Branches 58 Tags
6bb29dec13545926504d9011b72cbf26f20b903d
Commit Graph

2973 Commits

Author SHA1 Message Date
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
renovate[bot]
a80f77a996 fix(deps): update dependency pino-http to v10.5.0 (#34920) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-05 13:36:22 +00:00
Claire
5d9e5967aa Merge commit 'f7c19226cff625895478b80302201c98f36163c8' into glitch-soc/merge-upstream 2025-06-04 11:01:40 +02:00
renovate[bot]
37bf59f76a fix(deps): update dependency @vitejs/plugin-react to v4.5.1 (#34898) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-04 07:41:52 +00:00
Claire
088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
renovate[bot]
0182fc389e fix(deps): update dependency sass to v1.89.1 (#34875) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-02 07:49:37 +00:00
renovate[bot]
1b11bb23d7 chore(deps): update definitelytyped types (non-major) (#34884) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-02 07:37:15 +00:00
Claire
b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
renovate[bot]
75ae084976 fix(deps): update dependency rollup-plugin-visualizer to v6.0.1 (#34836) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 08:20:55 +00:00
renovate[bot]
474013b48c fix(deps): update dependency postcss-preset-env to v10.2.0 (#34821) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 08:01:02 +00:00
Claire
e8f713ba57 Merge commit '47512fe51867fd30f13e02731a9733fa971e8837' into glitch-soc/merge-upstream 2025-05-26 18:46:50 +02:00
renovate[bot]
47512fe518 fix(deps): update dependency rollup-plugin-visualizer to v6 (#34805) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-26 13:26:09 +00:00
Claire
342290a9e0 Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream 2025-05-26 12:31:26 +02:00
Claire
b3615a803e Remove unnecessary direct dependency to glob (#34809) 2025-05-26 07:42:24 +00:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
f622686397 Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies, including one textually adjacent to a
  glitch-soc-only dependency.
  Updated dependencies as upstream did.
 2025-05-25 14:38:25 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
Echo
84d03e4e16 Revert React Spring to 9.7.5 and updates Renovate (#34788) 2025-05-23 12:34:41 +00:00
renovate[bot]
229e100dc0 fix(deps): update dependency @vitejs/plugin-react to v4.5.0 (#34784) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-23 07:30:04 +00:00
Renaud Chaput
83dd09d4dc Fix JS polyfills missing after the Vite switch (#34758) 2025-05-21 20:11:01 +00:00
renovate[bot]
30ee67e2c6 fix(deps): update dependency @react-spring/web to v10.0.1 (#34752) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-21 08:39:04 +00:00
renovate[bot]
042a9c42be fix(deps): update dependency @reduxjs/toolkit to v2.8.2 (#34477) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-20 13:11:13 +00:00
renovate[bot]
0d809652d9 chore(deps): update dependency lint-staged to v16 (#34657) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-19 16:10:41 +00:00
renovate[bot]
8ab2c4a9fc chore(deps): update dependency stylelint-config-standard-scss to v15 (#34658) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:46:11 +00:00
renovate[bot]
65f338c812 fix(deps): update dependency pino to v9.7.0 (#34728) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-19 12:35:46 +00:00
renovate[bot]
39eff1c3ca fix(deps): update dependency sass to v1.89.0 (#34729) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-19 12:35:25 +00:00
renovate[bot]
feb4e0a007 fix(deps): update dependency @react-spring/web to v10 (#34693) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:35:10 +00:00
renovate[bot]
695f0c5eaa fix(deps): update dependency @vitejs/plugin-react to v4.4.1 (#34725) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-19 07:25:04 +00:00
renovate[bot]
3d2bc0c513 fix(deps): update dependency postcss-preset-env to v10.1.6 (#34720) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-19 07:03:02 +00:00
renovate[bot]
9d4ec09e7a fix(deps): update dependency ws to v8.18.2 (#34721) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-19 07:02:38 +00:00
renovate[bot]
b4bbea51c4 fix(deps): update dependency babel-plugin-formatjs to v10.5.38 (#34707) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-16 15:26:34 +00:00
Echo
c4f47adb49 Convert from Webpack to Vite (#34450) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-16 13:26:12 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
renovate[bot]
050d76c010 fix(deps): update dependency pg to v8.16.0 (#34670) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-13 07:38:15 +00:00
renovate[bot]
6fa48fabb2 fix(deps): update dependency sass to v1.88.0 (#34659) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-12 07:20:48 +00:00
Claire
a5a3a781e0 Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream 2025-05-09 18:16:46 +02:00
renovate[bot]
23238ddd95 fix(deps): update dependency vite to v6.2.7 [security] (#34640) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-09 08:05:58 +00:00
renovate[bot]
face71b7b2 fix(deps): update dependency @babel/core to v7.27.1 (#34643) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-09 07:14:25 +00:00
renovate[bot]
1131f2c439 fix(deps): update dependency ws to v8.17.1 [security] (#34641) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-09 06:48:30 +00:00
Claire
5cade30257 Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream 
Conflicts:
- `jest.config.js`
- `package.json`
- `tsconfig.json`
 2025-05-08 15:47:40 +02:00
Claire
d600aa4694 Merge commit '741f166407a79b666475aae662339c127f182e24' into glitch-soc/merge-upstream 2025-05-08 15:31:15 +02:00
Echo
8c579c5b34 Migrate from Jest to Vitest (#34454) 2025-05-07 18:29:02 +00:00
renovate[bot]
6ac29ab1ac fix(deps): update dependency @babel/preset-env to v7.27.2 (#34628) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-07 08:13:16 +00:00
renovate[bot]
b99abe44b0 fix(deps): update dependency cssnano to v7.0.7 (#34627) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-07 08:13:12 +00:00
Claire
d14d7a5379 Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream 2025-05-05 20:31:48 +02:00
renovate[bot]
2133f2b47e fix(deps): update dependency babel-plugin-formatjs to v10.5.38 (#34609) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-05 08:26:12 +00:00
renovate[bot]
d41a741e00 fix(deps): update dependency ws to v8.18.2 (#34603) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-05 07:55:52 +00:00
Claire
ff07676aee Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream 2025-05-03 18:03:42 +02:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00