glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Matt Jankowski	ce43ed144c	Rails 7.0 update (#25668 )	1 year ago
Claire	1399e9d863	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	1 year ago
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	1 year ago
Claire	9af6f6db1a	Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes	1 year ago
Claire	2aadebc769	Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes	1 year ago
Renaud Chaput	8d20afe0aa	Update Stylelint (#25819 )	1 year ago
Renaud Chaput	ecd8e0d612	Update Stylelint (#25819 )	1 year ago
renovate[bot]	5ad5dcd563	Update babel monorepo (#25930 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	8e0fd2d619	Update babel monorepo (#25930 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Kouhai	fa0f31a8fb	th: merge glitch again (lol)	1 year ago
Eugen Rochko	edb6aab974	Revert "Rails 7 update" (#25667 )	1 year ago
Eugen Rochko	ba06a2f104	Revert "Rails 7 update" (#25667 )	1 year ago
Matt Jankowski	5cadbaa296	Rails 7 update (#24241 )	1 year ago
Matt Jankowski	50c2a03695	Rails 7 update (#24241 )	1 year ago
Claire	ea57f8e3af	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	80a5c16ae1	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	5e18962962	Update dependency glob to v10.3.0 (#25608 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ceca93d0d1	Update dependency glob to v10.3.0 (#25608 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	51af55a38d	Update dependency pg to v8.11.1 (#25604 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	dbd37f129d	Update dependency pg to v8.11.1 (#25604 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	338334e21a	Update dependency pg-connection-string to v2.6.1 (#25605 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	b7f6280ef4	Update dependency pg-connection-string to v2.6.1 (#25605 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f7ba6af02c	Update dependency react-textarea-autosize to v8.5.0 (#25610 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a90190f813	Update dependency react-textarea-autosize to v8.5.0 (#25610 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	9123a25a84	Update dependency sass to v1.63.6 (#25607 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ccaa676452	Update dependency sass to v1.63.6 (#25607 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ee350f0491	Update dependency react-redux to v8.1.1 (#25432 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	9caa0475f8	Update dependency react-redux to v8.1.1 (#25432 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	b7af3115a7	Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.	1 year ago
Claire	178e151019	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.	1 year ago
renovate[bot]	4564d41358	Update dependency dotenv to v16.2.0 (#25506 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	cec4f1d506	Update dependency dotenv to v16.2.0 (#25506 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	7066e3d5ce	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.	1 year ago
Claire	6c99479ef4	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.	1 year ago
renovate[bot]	1dc2b1459d	Lock file maintenance (#25434 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	8b2048d0c8	Lock file maintenance (#25434 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f370bdc45e	Update dependency intl-messageformat to v10.5.0 (#25431 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a6d7abb29d	Update dependency intl-messageformat to v10.5.0 (#25431 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	37326f3117	Update dependency core-js to v3.31.0 (#25430 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	36566e9245	Update dependency core-js to v3.31.0 (#25430 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	2f57cdadcf	Update devDependencies (non-major) (#25427 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	841e35e291	Update devDependencies (non-major) (#25427 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	dc31ba1a28	Update dependency sass to v1.63.3 (#25422 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	b9e8d2b352	Update dependency sass to v1.63.3 (#25422 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	4ceaee0da5	Update formatjs monorepo (#25418 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	360759df7b	Update formatjs monorepo (#25418 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	2d07bde935	Update dependency glob to v10.2.7 (#25417 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f10f4f2359	Update dependency glob to v10.2.7 (#25417 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	d8ef35d088	Update babel monorepo to v7.22.5 (#25405 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
renovate[bot]	ae2790d84f	Update babel monorepo to v7.22.5 (#25405 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Claire	ee1de4206a	Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	1 year ago
Claire	c48ec9cb8c	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	1 year ago
Claire	3b87fe21fa	Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did not port the changes as I want to try something a bit different.	1 year ago
Claire	734e186717	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did not port the changes as I want to try something a bit different.	1 year ago
Claire	e6b6a0535e	Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream	1 year ago
Claire	aa57f7e3e2	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	1 year ago
Claire	c22b032483	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.	1 year ago
Claire	85722a918d	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.	1 year ago
renovate[bot]	c5e025a202	Update dependency webpack-bundle-analyzer to v4.9.0 (#25327 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	db047e323b	Update dependency webpack-bundle-analyzer to v4.9.0 (#25327 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	5b2ff76a79	Update dependency dotenv to v16.1.3 (#25302 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	5265655549	Update dependency dotenv to v16.1.3 (#25302 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	b1f8013267	Update dependency sass-loader to v10.4.1 (#25315 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7e22287caa	Update dependency sass-loader to v10.4.1 (#25315 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	26db476771	Update dependency redis to v4.6.7 (#25300 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	9a653899e9	Update dependency redis to v4.6.7 (#25300 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	8390f2c863	Update dependency react-redux to v8.0.7 (#25298 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	50a8f5b8a7	Update dependency react-redux to v8.0.7 (#25298 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	bda5be1406	Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	1 year ago
Claire	c22fc2fa80	Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	1 year ago
Renaud Chaput	29851c83bd	Fix `/share` and cleanup and reorganize frontend locale loading (#25240 )	1 year ago
Renaud Chaput	b0780cfeed	Fix `/share` and cleanup and reorganize frontend locale loading (#25240 )	1 year ago
Nick Schonning	f30caffb80	Update yarn.lock for audit issues (#25152 )	1 year ago
Nick Schonning	b489c200a6	Update yarn.lock for audit issues (#25152 )	1 year ago
Claire	bf3227b5dd	Bump workbox from 6.6.1 to 7.0.0 (#25232 )	1 year ago
Claire	dac460f43f	Bump workbox from 6.6.1 to 7.0.0 (#25232 )	1 year ago
dependabot[bot]	dade894b82	Bump eslint-plugin-jsdoc from 45.0.0 to 46.1.0 (#25222 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	5a50983654	Bump eslint-plugin-jsdoc from 45.0.0 to 46.1.0 (#25222 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	083e8715ef	Bump @types/jest from 29.5.1 to 29.5.2 (#25220 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	b05bbd91d0	Bump @types/jest from 29.5.1 to 29.5.2 (#25220 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	76960f128a	Upgrade react-intl (#24906 )	1 year ago
Renaud Chaput	44cd88adc4	Upgrade react-intl (#24906 )	1 year ago
dependabot[bot]	146e123a3c	Bump @babel/core and @types/babel__core (#25183 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	82f6d4c418	Bump @babel/core and @types/babel__core (#25183 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	e6b6217534	Bump @babel/plugin-transform-runtime from 7.21.4 to 7.22.4 (#25173 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	b86f3596ba	Bump @babel/plugin-transform-runtime from 7.21.4 to 7.22.4 (#25173 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	28b9bf054e	Bump @babel/preset-react from 7.18.6 to 7.22.3 (#25171 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	e24adacea1	Bump @babel/preset-react from 7.18.6 to 7.22.3 (#25171 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	4ac0377394	Bump @babel/runtime from 7.21.5 to 7.22.3 (#25170 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	e1d0343354	Bump @babel/runtime from 7.21.5 to 7.22.3 (#25170 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	58c565ae55	Bump @babel/preset-env from 7.21.5 to 7.22.4 (#25167 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
dependabot[bot]	0ed8164777	Bump @babel/preset-env from 7.21.5 to 7.22.4 (#25167 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	8b69a60257	Upgrade Workbox to 6.6.0 (#25197 )	1 year ago
Renaud Chaput	98e5e011aa	Upgrade Workbox to 6.6.0 (#25197 )	1 year ago
dependabot[bot]	9ba1135000	Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
dependabot[bot]	89d6341c80	Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
dependabot[bot]	3a71f78b1d	Bump @types/react from 18.2.6 to 18.2.7 (#25166 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	44eaa979d4	Bump @types/react from 18.2.6 to 18.2.7 (#25166 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	9f982d4e27	Bump jsdom from 22.0.0 to 22.1.0 (#25178 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	4869384fa0	Bump jsdom from 22.0.0 to 22.1.0 (#25178 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	85bc8d5da7	Bump @types/react-motion from 0.0.33 to 0.0.34 (#25185 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	66c1ad8be9	Bump @types/react-motion from 0.0.33 to 0.0.34 (#25185 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	c4054d75e1	Bump @typescript-eslint/parser from 5.59.7 to 5.59.8 (#25175 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	5f1a03fdba	Bump @typescript-eslint/parser from 5.59.7 to 5.59.8 (#25175 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	d7f607d506	Bump @typescript-eslint/eslint-plugin from 5.59.7 to 5.59.8 (#25182 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	6d41cdcc6a	Bump @typescript-eslint/eslint-plugin from 5.59.7 to 5.59.8 (#25182 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	210edaea50	Bump @types/lodash from 4.14.194 to 4.14.195 (#25184 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	8ff2d61add	Bump @types/lodash from 4.14.194 to 4.14.195 (#25184 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	2b709d80a3	Bump postcss from 8.4.23 to 8.4.24 (#25169 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	37dc48c3a1	Bump postcss from 8.4.23 to 8.4.24 (#25169 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Claire	973743ff50	Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.	1 year ago
Claire	0e7466717f	Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.	1 year ago
Claire	569302e5ce	Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream	1 year ago
Claire	e2ab9d4dad	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	1 year ago
Claire	3413fc7002	Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream	1 year ago
Claire	45d7358100	Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream	1 year ago
Claire	ee6f9d2c92	Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream	1 year ago
Claire	2e02d03524	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	1 year ago
Claire	11368da545	Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.	1 year ago
Claire	b735954971	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.	1 year ago
dependabot[bot]	b6c687abc2	Bump eslint from 8.40.0 to 8.41.0 (#25081 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	391c089d0d	Bump eslint from 8.40.0 to 8.41.0 (#25081 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	0ce5706b48	Bump eslint-plugin-jsdoc from 44.2.4 to 44.2.5 (#25112 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2e3b1ef13e	Bump eslint-plugin-jsdoc from 44.2.4 to 44.2.5 (#25112 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Renaud Chaput	432a937a9d	Update `react-redux` (#25110 )	2 years ago
Renaud Chaput	342daeb389	Update `react-redux` (#25110 )	2 years ago
dependabot[bot]	530151f6c8	Bump stylelint from 15.6.1 to 15.6.2 (#25078 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	5b332112fc	Bump stylelint from 15.6.1 to 15.6.2 (#25078 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	361e7ccf88	Bump rimraf from 5.0.0 to 5.0.1 (#25082 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	c2cbe90a89	Bump rimraf from 5.0.0 to 5.0.1 (#25082 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	580f35827f	Bump glob from 10.2.2 to 10.2.6 (#25083 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	9e59186f78	Bump glob from 10.2.2 to 10.2.6 (#25083 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	167b319cef	Bump webpack-merge from 5.8.0 to 5.9.0 (#25084 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	c7cbded282	Bump webpack-merge from 5.8.0 to 5.9.0 (#25084 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	1f88c425df	Bump @typescript-eslint/eslint-plugin from 5.59.6 to 5.59.7 (#25085 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	7cfa6424f1	Bump @typescript-eslint/eslint-plugin from 5.59.6 to 5.59.7 (#25085 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	e27d9a9130	Bump @typescript-eslint/parser from 5.59.6 to 5.59.7 (#25080 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	16d3e76a71	Bump @typescript-eslint/parser from 5.59.6 to 5.59.7 (#25080 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Renaud Chaput	ab029328cf	Upgrade to React 18 (#24916 )	2 years ago
Renaud Chaput	8d6aea3326	Upgrade to React 18 (#24916 )	2 years ago
Nick Schonning	9a02b3b350	Remove requestAnimationFrame test polyfill (#25056 )	2 years ago
Nick Schonning	7d805cfa90	Remove requestAnimationFrame test polyfill (#25056 )	2 years ago
Kouhai	a2e6a7d963	th: Merge remote-tracking branch 'glitch/main'	2 years ago
dependabot[bot]	69a440cba1	Bump jsdom from 21.1.2 to 22.0.0 (#24828 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	27ec8f297d	Bump jsdom from 21.1.2 to 22.0.0 (#24828 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	afb74b97b2	Bump pg-connection-string from 2.5.0 to 2.6.0 (#24999 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2ce0b666a1	Bump pg-connection-string from 2.5.0 to 2.6.0 (#24999 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	46c90ce2a5	Bump @typescript-eslint/eslint-plugin from 5.59.5 to 5.59.6 (#24998 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	520462799f	Bump @typescript-eslint/eslint-plugin from 5.59.5 to 5.59.6 (#24998 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	097d4dded1	Bump @typescript-eslint/parser from 5.59.5 to 5.59.6 (#25000 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	bbe4800b04	Bump @typescript-eslint/parser from 5.59.5 to 5.59.6 (#25000 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	1e31cc01b8	Bump eslint-plugin-jsdoc from 43.1.1 to 44.2.4 (#24994 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	4d6a8ee34a	Bump eslint-plugin-jsdoc from 43.1.1 to 44.2.4 (#24994 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Renaud Chaput	dae330bf32	Bump `mkdirp` major version (#24978 )	2 years ago
Renaud Chaput	2e1c6e93ad	Bump `mkdirp` major version (#24978 )	2 years ago
dependabot[bot]	68d5c67b9c	Bump eslint from 8.39.0 to 8.40.0 (#24919 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	713d217384	Bump eslint from 8.39.0 to 8.40.0 (#24919 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Renaud Chaput	6a3211876c	Add stricter ESLint rules for Typescript files (#24926 )	2 years ago
Renaud Chaput	5eeb40bdbe	Add stricter ESLint rules for Typescript files (#24926 )	2 years ago
Claire	710151baf4	Merge commit '0886856bd2adecedcad6fad9dcb86ed8069c46c0' into glitch-soc/merge-upstream	2 years ago
Claire	facc7ab03c	Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream	2 years ago
Claire	7f078e41c0	Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.	2 years ago
Claire	1a664560cc	Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.	2 years ago
Claire	5c4a012ac5	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did.	2 years ago
Claire	c81d1b0d38	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did.	2 years ago
Nick Schonning	0886856bd2	Use Prettier for ESLint formatting TypeScript (#23631 )	2 years ago
Nick Schonning	51b83ed195	Use Prettier for ESLint formatting TypeScript (#23631 )	2 years ago
dependabot[bot]	c6d818d02f	Bump @typescript-eslint/eslint-plugin from 5.59.2 to 5.59.5 (#24922 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	72dcb2ef58	Bump @typescript-eslint/eslint-plugin from 5.59.2 to 5.59.5 (#24922 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	908c5598e0	Bump @typescript-eslint/parser from 5.59.2 to 5.59.5 (#24921 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	a5ba98d2df	Bump @typescript-eslint/parser from 5.59.2 to 5.59.5 (#24921 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Renaud Chaput	b640f89777	Rework polyfills loading (#24907 )	2 years ago
Renaud Chaput	a3a2414f0e	Rework polyfills loading (#24907 )	2 years ago
Renaud Chaput	33fff17ebb	Upgrade `uuid` to 9.0.0 (#24917 )	2 years ago
Renaud Chaput	aec486b4ec	Upgrade `uuid` to 9.0.0 (#24917 )	2 years ago
Renaud Chaput	b785500809	Enforce React Rules of Hooks with eslint (#24911 )	2 years ago
Renaud Chaput	d9b93bd15e	Enforce React Rules of Hooks with eslint (#24911 )	2 years ago
Claire	348aed03cf	Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.	2 years ago
Claire	d77fbbed73	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.	2 years ago
Claire	2aaf3528ca	Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.	2 years ago
Claire	2d029dedd9	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.	2 years ago
dependabot[bot]	a0b5e9a1b1	Bump @babel/core from 7.21.5 to 7.21.8 (#24831 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	64fae0efb5	Bump @babel/core from 7.21.5 to 7.21.8 (#24831 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	08eacf6837	Bump stylelint from 15.6.0 to 15.6.1 (#24829 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	880e661d53	Bump stylelint from 15.6.0 to 15.6.1 (#24829 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	7eadc801fe	Bump react-select from 5.7.2 to 5.7.3 (#24830 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	ff974395c2	Bump react-select from 5.7.2 to 5.7.3 (#24830 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	e72e08165e	Bump axios from 1.3.6 to 1.4.0 (#24775 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	8d61d2b0da	Bump axios from 1.3.6 to 1.4.0 (#24775 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	5fb084b834	Bump @babel/preset-typescript from 7.21.4 to 7.21.5 (#24776 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	8f7c172eb8	Bump @babel/preset-typescript from 7.21.4 to 7.21.5 (#24776 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	e271027609	Bump @babel/preset-env from 7.21.4 to 7.21.5 (#24773 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b0ebaeb691	Bump @babel/preset-env from 7.21.4 to 7.21.5 (#24773 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	0c4905a9f3	Bump @babel/runtime from 7.21.0 to 7.21.5 (#24771 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	1d49718a84	Bump @babel/runtime from 7.21.0 to 7.21.5 (#24771 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	c679dde52b	Bump @babel/core from 7.21.4 to 7.21.5 (#24778 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	14a7e414fc	Bump @babel/core from 7.21.4 to 7.21.5 (#24778 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
fusagiko / takayamaki	69bd3a86f3	use configureStore of redux-toolkit instead of createStore of redux (#24790 )	2 years ago
fusagiko / takayamaki	8227af8dcc	use configureStore of redux-toolkit instead of createStore of redux (#24790 )	2 years ago
dependabot[bot]	d59c6124c9	Bump eslint-plugin-formatjs from 4.10.0 to 4.10.1 (#24770 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2839fbc733	Bump eslint-plugin-formatjs from 4.10.0 to 4.10.1 (#24770 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	64cdcb306b	Bump @typescript-eslint/eslint-plugin from 5.59.1 to 5.59.2 (#24768 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	4acf5f8971	Bump @typescript-eslint/eslint-plugin from 5.59.1 to 5.59.2 (#24768 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2df6b44245	Bump @typescript-eslint/parser from 5.59.1 to 5.59.2 (#24774 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	4b87e2a8db	Bump @typescript-eslint/parser from 5.59.1 to 5.59.2 (#24774 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	c269671c3e	Bump yargs from 17.7.1 to 17.7.2 (#24769 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b75c353962	Bump yargs from 17.7.1 to 17.7.2 (#24769 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	93b058f92b	Bump jsdom from 21.1.1 to 21.1.2 (#24767 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	18f58f4284	Bump jsdom from 21.1.1 to 21.1.2 (#24767 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	7368f031e6	Bump cssnano from 6.0.0 to 6.0.1 (#24777 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	389f0443c8	Bump cssnano from 6.0.0 to 6.0.1 (#24777 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	7a13eb370f	Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Nick Schonning	fc56eda94b	Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
dependabot[bot]	a42b2eca0d	Bump eslint from 8.38.0 to 8.39.0 (#24636 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	0669822ae8	Bump eslint from 8.38.0 to 8.39.0 (#24636 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	9ed1da3e63	Bump @types/jest from 29.4.2 to 29.5.1 (#24630 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	242d7864f1	Bump @types/jest from 29.4.2 to 29.5.1 (#24630 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	847a925f77	Bump @types/yargs from 17.0.22 to 17.0.24 (#24388 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	56cf092058	Bump @types/yargs from 17.0.22 to 17.0.24 (#24388 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	28be2cd75e	Bump @types/lodash from 4.14.191 to 4.14.194 (#24576 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	819daeb651	Bump @types/lodash from 4.14.191 to 4.14.194 (#24576 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	4040db68e3	Bump stylelint from 15.3.0 to 15.6.0 (#24635 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	921bef6799	Bump stylelint from 15.3.0 to 15.6.0 (#24635 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	0224c3c0d9	Add eslint-plugin-jsdoc (#24719 )	2 years ago
Nick Schonning	f22b4e556c	Add eslint-plugin-jsdoc (#24719 )	2 years ago
Claire	498de92bc8	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.	2 years ago
Claire	12b935fadf	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.	2 years ago
dependabot[bot]	99ffa91a65	Bump tesseract.js from 2.1.1 to 2.1.5 (#19084 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	d9e9579832	Bump tesseract.js from 2.1.1 to 2.1.5 (#19084 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	8cc47acb35	Bump sass from 1.62.0 to 1.62.1 (#24668 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b839babb39	Bump sass from 1.62.0 to 1.62.1 (#24668 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	c852321fa0	Bump lint-staged from 13.2.1 to 13.2.2 (#24669 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	785b0349eb	Bump lint-staged from 13.2.1 to 13.2.2 (#24669 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	5d9c2d4baa	Bump glob from 10.0.0 to 10.2.2 (#24632 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	872c4e1ef2	Bump glob from 10.0.0 to 10.2.2 (#24632 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	e01a12bb66	Bump sass from 1.61.0 to 1.62.0 (#24574 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2f5608e9e5	Bump sass from 1.61.0 to 1.62.0 (#24574 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2f9393dcab	Bump @typescript-eslint/eslint-plugin from 5.59.0 to 5.59.1 (#24633 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	5f624954be	Bump @typescript-eslint/eslint-plugin from 5.59.0 to 5.59.1 (#24633 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b65a3ad58b	Bump @typescript-eslint/parser from 5.59.0 to 5.59.1 (#24638 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	9650a5738a	Bump @typescript-eslint/parser from 5.59.0 to 5.59.1 (#24638 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	69e69c019f	Remove postcss-scss devDep (#24223 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Nick Schonning	dcdc614bd2	Remove postcss-scss devDep (#24223 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
dependabot[bot]	1729ab0614	Bump postcss from 8.4.22 to 8.4.23 (#24629 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	1820b55a11	Bump postcss from 8.4.22 to 8.4.23 (#24629 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	541aea1721	Bump prettier from 2.8.7 to 2.8.8 (#24631 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	0c66358601	Bump prettier from 2.8.7 to 2.8.8 (#24631 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	c27c58b22c	Bump axios from 1.3.5 to 1.3.6 (#24640 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	fba60094a2	Bump axios from 1.3.5 to 1.3.6 (#24640 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Emelia Smith	dca2892276	Remove clustering from streaming API (#24655 )	2 years ago
Emelia Smith	301e03eb8c	Remove clustering from streaming API (#24655 )	2 years ago
Nick Schonning	86d0a0b7d8	Enable formatjs/prefer-pound-in-plural (#24622 )	2 years ago
Nick Schonning	2daa5a1549	Enable formatjs/prefer-pound-in-plural (#24622 )	2 years ago
dependabot[bot]	e512d18e79	Bump @typescript-eslint/eslint-plugin from 5.58.0 to 5.59.0 (#24573 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	0c81eec239	Bump @typescript-eslint/eslint-plugin from 5.58.0 to 5.59.0 (#24573 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	541d7144d1	Bump @typescript-eslint/parser from 5.58.0 to 5.59.0 (#24568 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	03ea084f0d	Bump @typescript-eslint/parser from 5.58.0 to 5.59.0 (#24568 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	8e8185b618	Add eslint-plugin-formatjs (#23976 )	2 years ago
Nick Schonning	0c7ce98ff6	Add eslint-plugin-formatjs (#23976 )	2 years ago
Claire	5c962d77bb	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.	2 years ago
Claire	abfdafef1e	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.	2 years ago
dependabot[bot]	dd96b4ccec	Bump reselect from 4.1.7 to 4.1.8 (#24565 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	426e3cc3bc	Bump reselect from 4.1.7 to 4.1.8 (#24565 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	1b59cbb96f	Bump postcss from 8.4.21 to 8.4.22 (#24570 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	fe1ac6b0b0	Bump postcss from 8.4.21 to 8.4.22 (#24570 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	1723fd5056	Bump http-link-header from 1.1.0 to 1.1.1 (#24575 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	a5e9128b74	Bump http-link-header from 1.1.0 to 1.1.1 (#24575 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Claire	fca86b29d9	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Claire	f9a9f9344b	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
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>	2 years ago
dependabot[bot]	ce50f04f0a	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>	2 years ago
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>	2 years ago
dependabot[bot]	458e49c40c	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>	2 years ago
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>	2 years ago
dependabot[bot]	8ffa11740f	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>	2 years ago
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>	2 years ago
dependabot[bot]	0765aeba38	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>	2 years ago
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>	2 years ago
dependabot[bot]	fe841b6bb6	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>	2 years ago
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>	2 years ago
dependabot[bot]	b6e353fde1	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>	2 years ago
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>	2 years ago
dependabot[bot]	ccd74ecd10	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>	2 years ago
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>	2 years ago
dependabot[bot]	b178fd3f92	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>	2 years ago
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>	2 years ago
dependabot[bot]	7d7cfeaa06	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>	2 years ago
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>	2 years ago
dependabot[bot]	999d992c10	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>	2 years ago
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>	2 years ago
dependabot[bot]	3c7053a2db	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>	2 years ago
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>	2 years ago
dependabot[bot]	881326ff61	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>	2 years ago
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>	2 years ago
dependabot[bot]	08d318909c	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>	2 years ago
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.	2 years ago
Claire	ce12934f5b	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.	2 years ago
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>	2 years ago
dependabot[bot]	0358abe73a	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>	2 years ago
Claire	8364f82281	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago

... 4 5 6 7 8 ...

4339 Commits (c97bffb0545d2c389e0879fc4665c042bafe8964)