mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,477 Commits
69 Branches
21 Tags
340 MiB
Commit Graph

2631 Commits (7946d986a771262ac9fb4b23d04ab6db3d65adf9)

Author SHA1 Message Date
renovate[bot] aeefe5b2be
chore(deps): update eslint (non-major) (#30883) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 09:03:38 +00:00
renovate[bot] ed15ae075c
fix(deps): update dependency @reduxjs/toolkit to v2.2.6 (#30875) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 08:27:03 +00:00
renovate[bot] 3c1e1685c7
fix(deps): update dependency postcss to v8.4.39 (#30877) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 08:21:55 +00:00
renovate[bot] 9c7d56db9a
fix(deps): update dependency postcss-preset-env to v9.5.15 (#30878) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 08:21:40 +00:00
renovate[bot] 8142c7aa3e
chore(deps): update definitelytyped types (non-major) (#30882) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 08:21:15 +00:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
renovate[bot] 1bccba1408
chore(deps): update dependency @testing-library/react to v16 (#30533) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-28 11:39:32 +00:00
renovate[bot] 03bbb74b0c
fix(deps): update dependency prom-client to v15.1.3 (#30852) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-27 16:27:32 +00:00
renovate[bot] 07d222665b
chore(deps): update dependency typescript to v5.5.2 (#30815) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-25 17:25:11 +00:00
Claire 21ca03581a Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream 2024-06-24 19:39:42 +02:00
renovate[bot] 3f81e7dcc8
chore(deps): update dependency @types/http-link-header to v1.0.6 (#30814) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-24 10:16:24 +00:00
Claire 3b4607991d Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00
renovate[bot] 93741f6a70
fix(deps): update dependency glob to v10.4.2 (#30761) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-21 16:15:33 +00:00
renovate[bot] 5b938e6e20
chore(deps): update dependency @types/uuid to v10 (#30787) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-21 11:37:15 +00:00
Claire 52e34a6bd6 Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream 2024-06-19 11:59:06 +02:00
renovate[bot] 49b323c13d
fix(deps): update dependency cssnano to v7.0.3 (#30764) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-19 09:31:56 +00:00
Claire b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
renovate[bot] 81f95cf08e
fix(deps): update dependency sass to v1.77.6 (#30745) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-18 12:20:43 +00:00
Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Claire 677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
renovate[bot] c739b7f851
fix(deps): update dependency ws to v8.17.1 (#30733) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-17 09:13:07 +00:00
renovate[bot] 04d6cde393
chore(deps): update devdependencies (non-major) (#30735) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-17 09:13:07 +00:00
renovate[bot] 0a7249c7c6
fix(deps): update dependency pino to v9.2.0 (#30659) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-12 12:41:14 +00:00
renovate[bot] dff48ff705
fix(deps): update dependency sass to v1.77.5 (#30665) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-12 11:04:54 +00:00
Claire be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
renovate[bot] a6e0e167a7
fix(deps): update dependency uuid to v10 (#30624) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-10 14:29:11 +00:00
renovate[bot] dd4a976122
chore(deps): update devdependencies (non-major) (#30628) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-10 14:08:02 +00:00
renovate[bot] 452872412d
chore(deps): update dependency @types/lodash to v4.17.5 (#30627) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-10 14:07:35 +00:00
Claire 30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
renovate[bot] 5652ca6135
fix(deps): update babel monorepo to v7.24.7 (#30561) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-06 09:27:54 +00:00
renovate[bot] 20e490ba7e
fix(deps): update dependency cssnano to v7.0.2 (#30560) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-05 13:06:03 +00:00
renovate[bot] 1d3b75d124
fix(deps): update dependency pg to v8.12.0 (#30549) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-05 07:22:58 +00:00
renovate[bot] db49b0e5e9
chore(deps): update eslint (non-major) (#30527) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-03 07:35:11 +00:00
renovate[bot] 6e92a9b73e
chore(deps): update devdependencies (non-major) (#30526) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-03 07:35:06 +00:00
renovate[bot] 543fa26916
fix(deps): update dependency sass to v1.77.4 (#30496) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-31 09:26:40 +00:00
renovate[bot] ad3e200bf7
fix(deps): update dependency sass to v1.77.3 (#30476) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-30 14:41:29 +00:00
Claire c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
renovate[bot] ed99923138
chore(deps): update eslint (non-major) (#30444) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-27 09:57:19 +00:00
renovate[bot] 0ef5dc2b20
fix(deps): update dependency jsdom to v24.1.0 (#30431) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-27 09:40:37 +00:00
renovate[bot] 15480643e1
chore(deps): update dependency @types/react to v18.3.3 (#30441) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-27 09:36:59 +00:00
renovate[bot] 1034f13f57
chore(deps): update devdependencies (non-major) (#30442) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-27 09:25:55 +00:00
Claire d76106da12 Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream 2024-05-24 17:08:21 +02:00
renovate[bot] ccb6aeddac
fix(deps): update babel monorepo to v7.24.6 (#30415) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-24 14:44:03 +00:00
renovate[bot] 9305caf1fd
fix(deps): update dependency glob to v10.4.1 (#30411) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-24 08:27:11 +00:00
renovate[bot] 52a7d053ff
fix(deps): update dependency postcss-preset-env to v9.5.14 (#30409) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-24 08:26:07 +00:00
Claire 22d12229b2 Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream 2024-05-22 21:05:19 +02:00
renovate[bot] d9d4ba1b6f
fix(deps): update dependency glob to v10.3.16 (#30392) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-22 07:47:49 +00:00
renovate[bot] 6e67ca73f3
fix(deps): update dependency axios to v1.7.2 (#30372) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-22 07:35:27 +00:00
Claire d3136e6d58 Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream 2024-05-21 12:06:38 +02:00
renovate[bot] 0663c7d78d
fix(deps): update formatjs monorepo (#30359) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 17:14:10 +00:00
Claire e46321e63d Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
renovate[bot] 0ce22859a5
fix(deps): update dependency @rails/ujs to v7.1.3 (#30356) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:56:28 +00:00
renovate[bot] 814d00cf4b
chore(deps): update dependency @formatjs/cli to v6.2.12 (#30370) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:40:37 +00:00
renovate[bot] 778bd96a52
chore(deps): update dependency @types/lodash to v4.17.4 (#30371) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:40:20 +00:00
Nick Schonning 0f07e1cd4c
Fix yarn.lock diff (#30366) 2024-05-19 19:37:49 +00:00
renovate[bot] 0a343b9a91
fix(deps): update react monorepo to v18.3.1 (#30074) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-19 17:15:06 +00:00
Claire 57fb2cf948 Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream 2024-05-17 12:33:41 +02:00
renovate[bot] f7f5b9dadd
fix(deps): update dependency @rails/ujs to v7.1.3-3 (#30337) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-17 08:27:45 +00:00
renovate[bot] 226d7a7bad
fix(deps): update dependency sass to v1.77.2 (#30338) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-17 08:27:03 +00:00
Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
 2024-05-16 19:30:10 +02:00
renovate[bot] 356bbbaa7f
fix(deps): update dependency @reduxjs/toolkit to v2.2.5 (#30320) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-16 07:57:19 +00:00
renovate[bot] d5d3a0fc57
fix(deps): update dependency pino to v9.1.0 (#30283) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 13:38:51 +00:00
renovate[bot] 78a8263f73
fix(deps): update dependency postcss-preset-env to v9.5.13 (#30286) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 08:34:58 +00:00
renovate[bot] 38a330f963
fix(deps): update dependency core-js to v3.37.1 (#30293) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 08:25:34 +00:00
Claire 666760f450 Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did.
 2024-05-14 20:47:14 +02:00
renovate[bot] c66fdb3dff
Update dependency immutable to v4.3.6 (#30276) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-13 09:39:06 +00:00
renovate[bot] f66c9faca0
Update dependency sass to v1.77.1 (#30252) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-13 09:11:55 +00:00
renovate[bot] 123108b1cc
Update dependency postcss-preset-env to v9.5.12 (#30256) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-13 09:11:39 +00:00
renovate[bot] 5e7d88a85d
Update dependency glob to v10.3.15 (#30263) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-13 09:10:53 +00:00
renovate[bot] 471728d6dd
Update DefinitelyTyped types (non-major) (#30272) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-13 09:10:26 +00:00
renovate[bot] ab4efa3bf8
Update dependency @testing-library/react to v15.0.7 (#30273) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-13 09:10:09 +00:00
renovate[bot] 807cf354fc
Update dependency eslint-plugin-jsdoc to v48.2.4 (#30274) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-13 09:09:39 +00:00
Claire f35ba6963d Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
renovate[bot] 346530732c
Update dependency utf-8-validate to v6.0.4 (#30248) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-10 19:19:47 +00:00
renovate[bot] f3f63107f2
Update dependency @reduxjs/toolkit to v2.2.4 (#30223) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-10 09:59:15 +00:00
renovate[bot] 1aa3976f28
Update dependency pino-http to v10.1.0 (#30199) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-10 09:23:45 +00:00
renovate[bot] 6819bcc4b6
Update dependency glob to v10.3.14 (#30230) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-10 09:18:52 +00:00
Claire 21c904b0f6 Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-soc/merge-upstream 2024-05-07 20:30:17 +02:00
renovate[bot] c9ccba7045
Update dependency sass to v1.77.0 (#30200) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-07 12:43:11 +00:00
Claire f7dadc9f0b Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream 2024-05-07 12:13:02 +02:00
renovate[bot] 6167894547
Update dependency pino-http to v10 (#30191) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-06 17:14:46 +00:00
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
 2024-05-06 17:53:51 +02:00
renovate[bot] 4f0d18168c
Update DefinitelyTyped types (non-major) (#30184) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-06 08:46:43 +00:00
renovate[bot] 00c34070ae
Update eslint (non-major) (#30186) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-06 08:46:22 +00:00
renovate[bot] 86f17e4b32
Update devDependencies (non-major) (#30185) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-06 08:46:17 +00:00
renovate[bot] a96b828023
Update dependency postcss-preset-env to v9.5.11 (#30171) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-06 08:26:33 +00:00
renovate[bot] d544b83f91
Update formatjs monorepo (#30175) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-06 08:26:28 +00:00
Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
 2024-05-04 16:12:51 +02:00
Claire a76980a229 Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream 2024-05-04 15:40:07 +02:00
Claire d6f9c97ae4 Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
renovate[bot] 62992ba54a
Update dependency sass to v1.76.0 (#30138) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-02 08:14:45 +00:00
renovate[bot] a9dd68b90a
Update dependency react-redux to v9.1.2 (#30146) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-02 08:00:43 +00:00
Claire b039e62194 Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire eeefb7cdbc Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream 2024-05-01 19:42:34 +02:00
Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
 2024-05-01 19:38:34 +02:00
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 2024-05-01 19:30:41 +02:00
Claire 946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
 2024-05-01 18:56:48 +02:00
Claire 9ce82a35cb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire 3503fe1865 Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00