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

2317 Commits (46128f25b62ed20fa4cae6cecb3172c5e4eb3afd)

Author SHA1 Message Date
renovate[bot] 373aa95ddd
Update formatjs monorepo (#27849) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-14 10:30:39 +00:00
renovate[bot] da59407520
Update eslint (non-major) (#27831) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-13 14:40:50 +00:00
renovate[bot] a1b48460e4
Update DefinitelyTyped types (non-major) (#27830) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-13 14:40:10 +00:00
renovate[bot] 0c98a9d9be
Update devDependencies (non-major) (#25612) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-13 14:01:07 +00:00
renovate[bot] 5bca5c4c5b
Update formatjs monorepo (#27823) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-13 13:24:14 +00:00
renovate[bot] a7117bbef6
Update dependency @rails/ujs to v7.1.2 (#27811) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-13 13:13:57 +00:00
renovate[bot] fba838d61a
Update dependency @material-symbols/svg-600 to ^0.14.0 (#27803) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-10 12:45:19 +00:00
renovate[bot] dec2796a4a
Update dependency lint-staged to v15 (#27407) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-09 10:16:53 +00:00
renovate[bot] 4812832620
Update dependency axios to v1.6.1 (#27773) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-09 10:16:44 +00:00
renovate[bot] 23d88aa943
Update babel monorepo to v7.23.3 (#27789) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-09 10:16:36 +00:00
Renaud Chaput 757d7c73c0
Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
Matt Jankowski 790f6356be
Deduplicate yarn lock file (#27670) 2023-11-08 07:49:06 +00:00
renovate[bot] 14e49e5e36
Update dependency react-select to v5.8.0 (#27722) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:05:36 +00:00
renovate[bot] ac9f92bd73
Update formatjs monorepo (#27746) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:04:25 +00:00
renovate[bot] 0ca27b2d81
Update DefinitelyTyped types (non-major) (#27713) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-06 10:27:19 +00:00
renovate[bot] 22b4713d2e
Update eslint (non-major) (#27715) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-06 10:26:18 +00:00
Renaud Chaput 0e3401bc1c
Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
renovate[bot] b8adb08f92
Update dependency axios to v1.6.0 (#27580) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-30 22:31:32 +00:00
renovate[bot] 372494e553
Update dependency punycode to v2.3.1 (#27625) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-30 22:31:22 +00:00
renovate[bot] 547d3c1b9b
Update dependency core-js to v3.33.2 (#27624) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-30 22:30:26 +00:00
renovate[bot] c2cc1df5ef
Update dependency @types/react to v18.2.33 (#27615) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-30 22:30:02 +00:00
renovate[bot] 400f5c9174
Update dependency @material-symbols/svg-600 to v0.13.2 (#27565) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-26 10:49:39 +00:00
renovate[bot] 6e018f7228
Update dependency sass to v1.69.5 (#27566) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-26 10:48:55 +00:00
Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 2023-10-25 12:14:24 +02:00
Claire 4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream 
Conflicts and ported changes:
- updated `@rails/ujs` imports
 2023-10-24 19:59:19 +02:00
Eugen Rochko 134de736dc
Change icons in web UI (#27385) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-10-24 17:45:08 +00:00
Claire 79c154f602 Merge commit 'fc7734df8d8d53639bf244a2f2f3c39bc2fd12a7' into glitch-soc/merge-upstream 2023-10-24 19:20:14 +02:00
Claire 787d5ad386 Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it.
 2023-10-24 19:05:18 +02:00
Matt Jankowski e93a75f1a1
Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
renovate[bot] d5408dbb54
Update dependency prom-client to v15 (#27330) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 14:33:17 +02:00
renovate[bot] 53fd28b889
Update dependency react-select to v5.7.7 (#27003) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:45:14 +02:00
renovate[bot] f7b34707a8
Update babel monorepo to v7.23.2 (#27118) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:36:47 +02:00
renovate[bot] 25751c653e
Update DefinitelyTyped types (non-major) (#27414) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:35:54 +02:00
renovate[bot] 132204031f
Update dependency core-js to v3.33.1 (#27481) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:20:01 +02:00
renovate[bot] bb5bae186f
Update dependency webpack-merge to v5.10.0 (#27420) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:18:16 +02:00
renovate[bot] 69d3318055
Update dependency rimraf to v5.0.5 (#27140) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:16:02 +02:00
renovate[bot] cd08b436ab
Update dependency sass to v1.69.4 (#27004) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:15:31 +02:00
renovate[bot] 6f1eb89d21
Update dependency ws to v8.14.2 (#26980) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:14:16 +02:00
renovate[bot] 6f429d3f1b
Update formatjs monorepo (#27416) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:13:12 +02:00
renovate[bot] 773133befa
Update eslint (non-major) (#27415) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:12:17 +02:00
Claire 245513d630 Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream 2023-10-21 14:33:33 +02:00
Renaud Chaput 1b70d7ed7c
Upgrade to react-router v5 (#25047) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 19:44:55 +02:00
Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
 2023-10-17 21:35:07 +02:00
renovate[bot] a00fc83701
Update dependency bufferutil to v4.0.8 (#27412) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-16 11:09:20 +02:00
Claire 3da7afdeed Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream 2023-10-09 21:10:47 +02:00
renovate[bot] 5fc5a548b4
Update DefinitelyTyped types (non-major) (#27327) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-09 10:19:13 +02:00
renovate[bot] eabe839744
Update eslint (non-major) (#27328) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-09 09:43:42 +02:00
Claire 53f5b27bd1 Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02:00
Claire e9a181c52c Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream 2023-10-08 16:53:05 +02:00
Claire 702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
 2023-10-08 16:48:19 +02:00
Claire 19ebf7797e Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
renovate[bot] d22515861e
Update dependency @reduxjs/toolkit to v1.9.7 (#27275) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-05 10:28:47 +02:00
renovate[bot] 5f2d494f0d
Update dependency react-redux to v8.1.3 (#27229) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-02 13:18:29 +02:00
renovate[bot] bad1629dcd
Update dependency core-js to v3.33.0 (#27237) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-02 13:18:06 +02:00
renovate[bot] 73a92f9e7a
Update DefinitelyTyped types (non-major) (#27239) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-02 13:17:55 +02:00
renovate[bot] 5393be7a21
Update eslint (non-major) to v6.7.3 (#27213) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-29 15:51:27 +02:00
renovate[bot] 9b785877d2
Update DefinitelyTyped types (non-major) (#27212) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-29 15:34:32 +02:00
renovate[bot] 665093a7b6
Update dependency postcss to v8.4.31 (#27199) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-29 09:50:33 +02:00
renovate[bot] 66a7bc215c
Update dependency glob to v10.3.10 (#27169) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-28 10:30:19 +02:00
renovate[bot] 0f588a4a86
Update dependency axios to v1.5.1 (#27159) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-28 10:17:08 +02:00
renovate[bot] 2979a5924b
Update dependency @material-design-icons/svg to v0.14.13 (#27181) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-28 10:14:43 +02:00
Claire abdb58840a Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
renovate[bot] 2054ee7cd5
Update dependency glob to v10.3.9 (#27148) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-26 11:12:21 +02:00
renovate[bot] 33a066a952
Update dependency glob to v10.3.8 (#27145) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-26 10:47:04 +02:00
renovate[bot] aeeddb9d46
Update DefinitelyTyped types (non-major) (#27109) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 11:56:21 +02:00
renovate[bot] 82c44f492d
Update dependency glob to v10.3.7 (#27078) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 11:03:19 +02:00
renovate[bot] c56d7d702f
Update dependency @reduxjs/toolkit to v1.9.6 (#27110) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 10:36:46 +02:00
renovate[bot] 1fa40cff70
Update eslint (non-major) (#27113) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 10:09:51 +02:00
Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
 2023-09-21 15:12:00 +02:00
renovate[bot] c74670b4d3
Update dependency glob to v10.3.5 (#27002) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-21 11:06:16 +02:00
renovate[bot] 4ed9d9ca6f
Update dependency autoprefixer to v10.4.16 (#27000) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-21 11:00:15 +02:00
Claire 22ee4e057d Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream 
Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
 2023-09-19 12:59:23 +02:00
Claire 1e87575b70 Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream 2023-09-19 12:53:32 +02:00
renovate[bot] a83615edc9
Update eslint (non-major) (#26954) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-19 12:51:13 +02:00
renovate[bot] 6eb6209d02
Update DefinitelyTyped types (non-major) (#26953) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-19 12:24:26 +02:00
renovate[bot] 6f9f901153
Update dependency postcss to v8.4.30 (#26964) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-19 11:03:42 +02:00
Claire 9688c5fcc4 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-18 12:09:37 +02:00
renovate[bot] 8b5c61ae3a
Update formatjs monorepo (#26955) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-18 08:52:49 +02:00
renovate[bot] 04623e2f34
Update babel monorepo to v7.22.20 (#26946) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-18 08:34:04 +02:00
Claire dfc05ec8df Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
 2023-09-15 21:43:49 +02:00
Claire e193c848fe Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
 2023-09-15 21:25:05 +02:00
Claire 08b495d95c Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire 5d8c65f2a7 Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
renovate[bot] 82015dbab6
Update dependency sass to v1.67.0 (#26914) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-15 10:03:55 +02:00
renovate[bot] 3103415364
Update dependency @babel/core to v7.22.19 (#26920) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-15 09:09:22 +02:00
renovate[bot] 93223633fc
Update dependency uuid to v9.0.1 (#26900) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-12 12:38:52 +02:00
renovate[bot] f3be4eb0dc
Update dependency @rails/ujs to v7.0.8 (#26871) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-11 11:32:30 +02:00
renovate[bot] 3679e67fad
Update dependency @babel/core to v7.22.17 (#26855) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-11 11:12:22 +02:00
renovate[bot] c10142ac3c
Update formatjs monorepo (#26874) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-11 10:54:59 +02:00
renovate[bot] b1d8907138
Update dependency @types/lodash to v4.14.198 (#26878) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-11 10:26:23 +02:00
renovate[bot] 959ccf5682
Update eslint (non-major) (#26881) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-11 10:25:54 +02:00
renovate[bot] d5155cbc21
Update dependency ws to v8.14.1 (#26862) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-11 09:59:18 +02:00
Renaud Chaput e9b528eaee
Use NodeJS v20 by default (#26830) 2023-09-08 13:45:34 +02:00
renovate[bot] 712d96b207
Update dependency ws to v8.14.0 (#26821) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-08 12:43:21 +02:00
renovate[bot] d0f7d879a6
Update formatjs monorepo (#26844) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-08 12:42:55 +02:00
renovate[bot] 858ad1f363
Update dependency core-js to v3.32.2 (#26841) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-07 16:49:31 +02:00
renovate[bot] b9e2eb5184
Update dependency @material-design-icons/svg to v0.14.12 (#26832) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-07 14:59:42 +02:00
renovate[bot] 9e3567bfbe
Update dependency webpack to v4.47.0 (#26825) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-06 22:25:03 +02:00
Claire e66f961e05 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-04 18:27:46 +02:00
renovate[bot] ddeca3b37b
Update babel monorepo to v7.22.15 (#26790) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 17:56:47 +02:00
renovate[bot] 3e6a6439b5
Update dependency stylelint-config-standard-scss to v11 (#26780) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 11:02:36 +02:00
renovate[bot] 1f92436745
Update DefinitelyTyped types (non-major) (#26785) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 09:26:33 +02:00
renovate[bot] 173041f02c
Update dependency typescript to v5.2.2 (#26786) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 09:08:53 +02:00
Claire 4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
 2023-09-02 14:44:47 +02:00
Claire ffb486648c Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream 2023-09-02 13:34:54 +02:00
Claire afc3b12217 Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
 2023-09-02 13:31:15 +02:00
Claire c8aa3d6d06 Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream 2023-09-02 12:02:23 +02:00
Claire 6b7c47311d Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00
Gabriel Simmer be991f1d18
Move to ioredis for streaming (#26581) 
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
 2023-09-01 17:44:28 +02:00
renovate[bot] 430eac3eb1
Update dependency @babel/preset-env to v7.22.14 (#26732) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-31 10:23:24 +02:00
renovate[bot] ef9a85a2d8
Update dependency webpack-bundle-analyzer to v4.9.1 (#26733) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-31 09:52:23 +02:00
renovate[bot] 15949e42c2
Update dependency glob to v10.3.4 (#26734) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-31 09:49:34 +02:00
renovate[bot] 24deaf2e4a
Update dependency postcss to v8.4.29 (#26720) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-30 09:44:14 +02:00
renovate[bot] a67cf439ee
Update dependency axios to v1.5.0 (#26680) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-29 10:50:27 +02:00
renovate[bot] 9d9de8d219
Update dependency @testing-library/jest-dom to v6 (#26479) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-08-28 12:19:42 +02:00
renovate[bot] 4ea5db90da
Update DefinitelyTyped types (non-major) (#26693) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-28 11:04:06 +02:00
renovate[bot] fc14d1f3b0
Update eslint (non-major) (#26694) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-28 10:20:02 +02:00
renovate[bot] e4c0ce18a3
Update dependency immutable to v4.3.4 (#26655) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-25 17:02:33 +02:00
renovate[bot] c66f756522
Update babel monorepo to v7.22.11 (#26640) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-25 10:08:44 +02:00
Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
 2023-08-24 21:56:00 +02:00
Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
 2023-08-24 21:46:17 +02:00
Claire 296b3d1560 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
 2023-08-24 21:26:27 +02:00
Claire fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
 2023-08-24 21:01:19 +02:00
renovate[bot] 24ea6f851f
Update dependency redis to v4.6.8 (#26630) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-24 09:59:13 +02:00
renovate[bot] 34f5b90dc7
Update dependency sass to v1.66.1 (#26534) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:56 +02:00
renovate[bot] de8c2427a5
Update dependency immutable to v4.3.3 (#26622) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:21 +02:00
renovate[bot] ea1a221e2d
Update dependency react-textarea-autosize to v8.5.3 (#26607) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 08:26:30 +02:00
Claire 10404aece8 Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Renaud Chaput bb2db2aec0
Add `circular-dependency-plugin` to detect any circular deps issues (#26600) 2023-08-22 13:24:16 +02:00
Claire 7e25e311d5 Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream 2023-08-21 21:07:39 +02:00
renovate[bot] 1cdcd9dc08
Update eslint (non-major) (#26567) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-21 10:13:21 +02:00
renovate[bot] d3b4422b94
Update dependency core-js to v3.32.1 (#26548) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-21 09:06:33 +02:00
renovate[bot] 1cb978bcc3
Update dependency @material-design-icons/svg to v0.14.11 (#26536) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-18 11:10:05 +02:00
renovate[bot] b5acf13886
Update dependency pg to v8.11.3 (#26519) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-17 16:43:37 +02:00
renovate[bot] 26eaf058e2
Update dependency postcss to v8.4.28 (#26502) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-16 09:08:57 +02:00
renovate[bot] c65032fb11
Update dependency autoprefixer to v10.4.15 (#26473) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-14 13:39:28 +02:00
Renaud Chaput 1eac3a60de
Upgrade `@types/react` (#26457) 2023-08-14 09:40:07 +02:00
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
 2023-08-13 18:47:15 +02:00
Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
 2023-08-11 22:15:41 +02:00
Renaud Chaput 121443c0fc
Upgrade JS dev dependencies (#26442) 2023-08-11 09:59:57 +02:00
renovate[bot] 3dd3c50811
Update dependency pg-connection-string to v2.6.2 (#26427) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 11:07:33 +02:00
renovate[bot] 27d8e9be4a
Update dependency eslint-import-resolver-typescript to v3.6.0 (#26429) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 11:07:15 +02:00
renovate[bot] 7572fa21a3
Update babel monorepo to v7.22.10 (#26421) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 11:01:40 +02:00
renovate[bot] 05022c9218
Update dependency pg to v8.11.2 (#26426) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:59:42 +02:00
renovate[bot] 700f948fc9
Update dependency @rails/ujs to v7.0.7 (#26422) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:44:14 +02:00
renovate[bot] 54dfacafcb
Update dependency regenerator-runtime to ^0.14.0 (#26432) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:39:47 +02:00
renovate[bot] ba318a42fe
Update dependency sass to v1.65.1 (#26433) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:23:37 +02:00
renovate[bot] c645308c6e
Update dependency eslint-config-prettier to v9 (#26434) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:23:00 +02:00
renovate[bot] 74c422ad0a
Update dependency immutable to v4.3.2 (#26425) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 09:48:41 +02:00
renovate[bot] 26fa4a6e82
Update eslint (non-major) (#26323) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-09 22:21:41 +02:00