Kouhai
004c452343
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 01:48:47 -07:00
Kouhai
bd2edc2d37
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
33bff421e4
th: hack: fix excessively noisy babel traces
2023-04-22 00:38:08 -07:00
Kouhai
ee1dc4a0d1
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
da1aa87c6f
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
228f9c72d4
th: update models, node/Gemfile state
2023-04-22 00:38:08 -07:00
Claire
fca86b29d9
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-16 17:52:44 +02:00
dependabot[bot]
509dac0516
Bump glob from 9.3.4 to 10.0.0 ( #24490 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 16:02:19 +02:00
dependabot[bot]
a1ff2b4e4f
Bump @typescript-eslint/eslint-plugin from 5.55.0 to 5.58.0 ( #24488 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 15:39:08 +02:00
dependabot[bot]
4f9e22f5f9
Bump @typescript-eslint/parser from 5.55.0 to 5.58.0 ( #24494 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 15:25:55 +02:00
dependabot[bot]
f3d7e68c36
Bump eslint from 8.36.0 to 8.38.0 ( #24493 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 15:03:44 +02:00
dependabot[bot]
ae61e54bb4
Bump sass from 1.60.0 to 1.61.0 ( #24487 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 13:43:54 +02:00
dependabot[bot]
3537c7f650
Bump rimraf from 4.4.1 to 5.0.0 ( #24492 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 12:15:53 +02:00
dependabot[bot]
b8d29a5857
Bump @babel/plugin-transform-runtime from 7.21.0 to 7.21.4 ( #24394 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 12:11:13 +02:00
dependabot[bot]
7397e1e498
Bump @babel/preset-env from 7.20.2 to 7.21.4 ( #24382 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 12:04:40 +02:00
dependabot[bot]
e73d6eecbe
Bump @babel/preset-typescript from 7.21.0 to 7.21.4 ( #24396 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 11:54:16 +02:00
dependabot[bot]
66bb86bd43
Bump @babel/core from 7.21.3 to 7.21.4 ( #24386 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 11:47:10 +02:00
dependabot[bot]
981bad084b
Bump axios from 1.3.4 to 1.3.5 ( #24485 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 10:57:57 +02:00
dependabot[bot]
ba29c46e38
Bump typescript from 5.0.3 to 5.0.4 ( #24489 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 10:57:41 +02:00
dependabot[bot]
7c4d0f9202
Bump lint-staged from 13.2.0 to 13.2.1 ( #24491 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-11 10:57:08 +02:00
Claire
9558de3b67
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Nick Schonning
e9df65bad0
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
dependabot[bot]
d565690739
Bump typescript from 4.9.5 to 5.0.3 ( #24398 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04 15:05:12 +02:00
Claire
8364f82281
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-04 12:45:12 +02:00
dependabot[bot]
effdd4d6af
Bump glob from 9.3.2 to 9.3.4 ( #24383 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04 11:25:25 +02:00
Nick Schonning
72a1dd736a
Align typings with installed versions ( #24410 )
2023-04-04 10:48:26 +02:00
Claire
5fbae7cb2a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
Claire
d586a37618
Clean up JS dependencies ( #24377 )
2023-04-03 15:06:29 +02:00
Nick Schonning
d0bf149232
Move ESLint configs to overrides ( #24370 )
2023-04-03 12:41:10 +02:00
Renaud Chaput
eb171b7ce4
Fix build issues caused by #16210 ( #24374 )
2023-04-03 12:31:34 +02:00
fusagiko / takayamaki
4866812b28
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00
Claire
5e6da39214
Restore exif-js dependency
2023-03-31 22:50:57 +02:00
Claire
1a0c54554f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
dependabot[bot]
eb8d0e0dfc
Bump cssnano from 5.1.15 to 6.0.0 ( #24296 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-30 10:38:00 +02:00
dependabot[bot]
0771672b23
Bump sass from 1.59.3 to 1.60.0 ( #24292 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-29 11:27:14 +02:00
dependabot[bot]
d865ecc9a3
Bump rimraf from 4.4.0 to 4.4.1 ( #24291 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-29 11:11:50 +02:00
dependabot[bot]
2e03db257a
Bump react-textarea-autosize from 8.4.0 to 8.4.1 ( #24293 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-29 11:03:38 +02:00
dependabot[bot]
cb96dd2a2c
Bump react-select from 5.7.1 to 5.7.2 ( #24294 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-29 10:37:33 +02:00
dependabot[bot]
313043a38f
Bump prettier from 2.8.5 to 2.8.7 ( #24295 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-29 10:35:27 +02:00
dependabot[bot]
ac792ced54
Bump mkdirp from 2.1.5 to 2.1.6 ( #24297 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-29 10:34:49 +02:00
dependabot[bot]
041c1c5305
Bump glob from 9.3.0 to 9.3.2 ( #24298 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-29 10:34:27 +02:00
Nick Schonning
a159e8e5e1
Move marky to devDependency ( #24258 )
2023-03-27 16:11:45 +02:00
Nick Schonning
6ff64efd07
Setup Husky and lint-stage for commit fixing ( #23308 )
2023-03-27 05:17:19 +02:00
Claire
6a5a699fbb
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
Eugen Rochko
1d2a941bc8
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
Yamagishi Kazutoshi
e272fc91e4
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
Nick Schonning
169b9c9b13
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
Claire
d11d2dda17
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
dependabot[bot]
bd5bc8798c
Bump prettier from 2.8.4 to 2.8.5 ( #24188 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21 10:51:31 +09:00
dependabot[bot]
582793fc24
Bump stylelint from 15.2.0 to 15.3.0 ( #24185 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21 10:49:48 +09:00