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
26,140 Commits 74 Branches 58 Tags
a06e96f99ee94f210c89331d99911c35601d51ec
Commit Graph

3060 Commits

Author SHA1 Message Date
Claire
d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.
 2025-09-02 19:07:51 +02:00
renovate[bot]
bf860c39c2 Update dependency vite to v7.1.4 (#35983) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-02 09:21:31 +00:00
renovate[bot]
b829d89757 Update dependency use-debounce to v10.0.6 (#35982) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-02 08:29:24 +00:00
Claire
03e07d88d7 Merge commit 'd880f397dfbe95bb8c3c9ed5730fbba76398df5f' into glitch-soc/merge-upstream 2025-08-28 20:23:39 +02:00
renovate[bot]
d880f397df Update dependency @vitejs/plugin-react to v5.0.2 (#35942) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-28 14:04:38 +00:00
Claire
884d7996b1 Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream 2025-08-27 18:13:03 +02:00
renovate[bot]
6f34db9bb7 Update dependency sass to v1.91.0 (#35906) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-27 12:51:06 +00:00
Claire
e8fe33f273 Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.
 2025-08-25 22:15:28 +02:00
renovate[bot]
d85743576c Update dependency vite-plugin-svgr to v4.5.0 (#35885) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-25 06:46:10 +00:00
renovate[bot]
a1ca52ed8f Update dependency @types/react to v18.3.24 (#35888) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-25 06:43:24 +00:00
Claire
02134172f1 Merge commit 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Glitch-soc had different overrides, but upstream simply disabled the rules.
  Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
  Not really a conflict, again because of a rubocop comment.
 2025-08-22 22:33:11 +02:00
renovate[bot]
23de9c7e6c Update dependency vite-plugin-static-copy to v3.1.2 (#35846) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-21 11:33:11 +00:00
renovate[bot]
83f151947e Update dependency core-js to v3.45.1 (#35843) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-21 07:29:58 +00:00
renovate[bot]
e28fe4199d Update dependency vite-plugin-pwa to v1.0.3 (#35830) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-20 08:09:02 +00:00
Claire
71cee3e472 Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency adjacent to one that is only in glitch-soc.
  Updated as upstream did.
 2025-08-19 18:46:12 +02:00
renovate[bot]
5d24cb7514 Update dependency @vitejs/plugin-react to v5.0.1 (#35817) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-19 06:51:08 +00:00
renovate[bot]
a81b6beeca Update dependency vite to v7.1.3 (#35818) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-19 06:51:05 +00:00
Claire
4d9150735a Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
  Updated the dependency as upstream did.
 2025-08-17 20:52:34 +02:00
renovate[bot]
ac0581fd22 Update devDependencies (non-major) (#35660) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-08-14 08:36:38 +00:00
renovate[bot]
2112416761 Update dependency @rails/ujs to v7.1.502 (#35772) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-14 07:34:30 +00:00
renovate[bot]
613cbf720c Update dependency eslint-plugin-jsdoc to v54 (#35760) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-13 07:28:21 +00:00
renovate[bot]
783b33e2da Update dependency pino to v9.8.0 (#35722) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 13:54:40 +00:00
renovate[bot]
5847117573 Update dependency eslint-plugin-jsdoc to v53 (#35742) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 13:54:22 +00:00
renovate[bot]
d9d7914a8d Update dependency vite to v7.1.2 (#35746) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 07:44:48 +00:00
Renaud Chaput
379f12ea00 Update to Vite 7 (#35598) 2025-08-11 12:35:36 +00:00
renovate[bot]
9c5b4b2639 Update dependency sass to v1.90.0 (#35695) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-11 08:57:42 +00:00
Claire
11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
 2025-08-09 23:02:43 +02:00
renovate[bot]
ce1680e6f9 Update dependency core-js to v3.45.0 (#35667) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-08 15:32:15 +00:00
Claire
53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Echo
28b0e5ee78 Provides legacy fallback for browser that don't support regex flag v (#35659) 2025-08-04 17:15:46 +00:00
renovate[bot]
49dcbd22d6 Update eslint (non-major) (#35661) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-04 14:19:48 +00:00
renovate[bot]
59e729e3fe Update dependency ioredis to v5.7.0 (#35617) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-04 08:34:04 +00:00
renovate[bot]
3d3d2c93d6 Update DefinitelyTyped types (non-major) (#35647) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-04 08:12:11 +00:00
Claire
dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
Echo
6bca52453a Emoji Rendering Efficiency (#35568) 2025-07-31 17:30:14 +00:00
Claire
e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
renovate[bot]
25add0af31 Update dependency cross-env to v10 (#35564) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-30 12:15:56 +00:00
renovate[bot]
027657b590 Update dependency eslint-plugin-jsdoc to v52 (#35561) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-30 12:14:33 +00:00
renovate[bot]
3b01f98c11 fix(deps): update dependency vite-plugin-pwa to v1.0.2 (#35529) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-28 08:32:47 +00:00
Claire
72affd6b45 Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
  Conflict because of upstream VS glitch-soc repos.
  Updated version number as upstream did, but kept glitch-soc repos.
 2025-07-24 18:10:38 +02:00
renovate[bot]
c871c7398e fix(deps): update dependency @vitejs/plugin-react to v4.7.0 (#35421) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-24 09:00:32 +00:00
Claire
63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +02:00
Claire
45d79427c4 Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Conflict because of differently-named theme plugins.
  Updated to go with upstream's changes.
 2025-07-23 12:08:59 +02:00
renovate[bot]
593cdae404 fix(deps): update dependency axios to v1.11.0 (#35471) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-23 08:12:16 +00:00
Claire
889c0b3a1f Merge commit '9e6a9efe101b36291897ae9fd4dbc5163a6cef38' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream added/updated dependency adjacent to glitch-soc-only dependency.
  Updated as upstream did.
- `vite.config.mts`:
  Upstream reworked the config file while using a different plugin for themes.
  Adapted upstream's changes.
- `yarn.lock`:
  Same as `package.json`
 2025-07-22 23:07:30 +02:00
Echo
760d00b7f7 Emoji Rendering (#35424) 2025-07-22 14:43:15 +00:00
renovate[bot]
ae13063460 chore(deps): update dependency eslint-plugin-jsdoc to v51 (#35026) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-21 16:31:10 +00:00
renovate[bot]
1ed58aaaf2 fix(deps): update dependency axios to v1.10.0 (#35050) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-21 16:28:49 +00:00
renovate[bot]
bf17895d19 chore(deps): update dependency chromatic to v13 (#35064) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-21 16:28:01 +00:00
Matt Jankowski
20b3c43dde Update playwright-ruby-client to version 1.54.0 (#35448) 2025-07-21 16:24:55 +00:00