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

2567 Commits (c97e798d8cc36c22e7a622628a97fb07954db993)

Author SHA1 Message Date
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