mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,598 Commits
68 Branches
18 Tags
331 MiB
Commit Graph

2488 Commits (fe7db7905fe9b8a120b6f6f7169eefd3df976727)

Author SHA1 Message Date
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
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
Claire 2c386d4cfe Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream 2024-05-01 17:06:49 +02:00
Claire d52263e0e3 Merge commit '143d9553fa0187b9950a802cdedaea5c8cd12f75' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependencies as well.
 2024-05-01 17:04:33 +02:00
Claire 0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes.
 2024-05-01 16:10:45 +02:00
Claire 7b46517c38 Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
renovate[bot] 23223369e0
Update eslint (non-major) (#30110) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 08:09:50 +00:00
renovate[bot] c0584a6f4f
Update devDependencies (non-major) (#30109) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 08:09:27 +00:00
Renaud Chaput 36909065b5
Convert easy entrypoints files to Typescript (#30102) 2024-04-29 08:02:41 +00:00
renovate[bot] 17e0a31fe3
Update dependency cssnano to v7 (#30061) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-26 15:32:38 +00:00
renovate[bot] ac82f34f7d
Update dependency pino to v9 (#30057) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-26 14:49:54 +00:00
renovate[bot] 91c7406b59
Update dependency postcss-preset-env to v9.5.9 (#30029) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-23 08:41:50 +00:00
renovate[bot] 24e67c4394
Update dependency postcss-preset-env to v9.5.8 (#30018) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-22 08:24:08 +00:00
renovate[bot] 3e21af3e4a
Update dependency @types/react to v18.2.79 (#30024) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-22 08:14:09 +00:00
renovate[bot] 223936c2e8
Update eslint (non-major) to v7.7.0 (#30026) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-22 08:13:04 +00:00
renovate[bot] e5d5bd7ff1
Update dependency postcss-preset-env to v9.5.6 (#29983) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-18 16:24:55 +00:00
renovate[bot] 630572323f
Update dependency ioredis to v5.4.1 (#29977) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-17 21:52:26 +00:00
renovate[bot] a390299744
Update dependency ioredis to v5.4.0 (#29969) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-17 09:08:19 +00:00
renovate[bot] ee8f999a7b
Update dependency core-js to v3.37.0 (#29968) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-17 09:08:08 +00:00
renovate[bot] 0622107449
Update dependency @testing-library/react to v15 (#29893) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-16 09:44:02 +00:00
renovate[bot] 6ee1b034b6
Update dependency prom-client to v15.1.2 (#29957) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-16 08:45:20 +00:00
renovate[bot] 34e826f373
Update dependency typescript to v5.4.5 (#29945) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-15 07:28:29 +00:00
renovate[bot] 1906330d13
Update dependency react-redux to v9.1.1 (#29943) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-15 07:27:56 +00:00
renovate[bot] 80edd7a317
Update DefinitelyTyped types (non-major) (#29944) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-15 07:27:33 +00:00
renovate[bot] 86c53e175d
Update dependency @testing-library/react to v14.3.1 (#29947) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-15 07:26:41 +00:00
renovate[bot] 67a37c7279
Update dependency sass to v1.75.0 (#29919) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-12 10:56:49 +00:00
renovate[bot] 8986e3b088
Update dependency webpack-bundle-analyzer to v4.10.2 (#29909) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-12 09:48:13 +00:00
renovate[bot] 3f821e0d5e
Update dependency postcss-preset-env to v9.5.5 (#29912) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-12 09:41:44 +00:00
renovate[bot] b8dca8d22a
Update dependency typescript to v5.4.4 (#29875) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 14:08:32 +00:00
renovate[bot] a1277a9b2b
Update eslint (non-major) (#29877) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:17:23 +00:00
renovate[bot] 2441fe6fd4
Update dependency stylelint-config-standard-scss to v13.1.0 (#29876) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:16:57 +00:00
renovate[bot] b06510d579
Update DefinitelyTyped types (non-major) (#29874) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:16:36 +00:00
renovate[bot] 499b184fcd
Update dependency pino to v8.20.0 (#29865) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:16:20 +00:00
renovate[bot] 79bbb2023d
Update dependency react-intl to v6.6.5 (#29864) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:15:46 +00:00
Claire 0e76b919b5 Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire 67842ffb22 Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream 2024-04-06 19:54:11 +02:00
Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
renovate[bot] 91d3b3fb25
Update dependency sass to v1.74.1 (#29846) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-04 07:25:30 +00:00
renovate[bot] 58dfc12af2
Update babel monorepo to v7.24.4 (#29840) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-04 07:23:53 +00:00
renovate[bot] 37d984b8bf
Update eslint (non-major) (#29820) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-04-03 18:05:39 +00:00
renovate[bot] 4233ee1f59
Update dependency pg to v8.11.5 (#29833) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 21:33:43 +00:00