monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,793 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

2533 Commits

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