4492 Commits (th-downstream)

Author	SHA1	Message	Date
renovate[bot]	547d3c1b9b	Update dependency core-js to v3.33.2 (#27624) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c2cc1df5ef	Update dependency @types/react to v18.2.33 (#27615) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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>	1 year ago
renovate[bot]	6e018f7228	Update dependency sass to v1.69.5 (#27566) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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.	1 year ago
Claire	4b0fb764c3	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream ... Conflicts and ported changes: - updated `@rails/ujs` imports	1 year ago
Eugen Rochko	134de736dc	Change icons in web UI (#27385) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Claire	79c154f602	Merge commit 'fc7734df8d8d53639bf244a2f2f3c39bc2fd12a7' into glitch-soc/merge-upstream	1 year ago
Claire	787d5ad386	Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Caused by a glitch-soc-only dependency (`exif-js`). Kept it.	1 year ago
Matt Jankowski	e93a75f1a1	Rails 7.1 update (#25963)	1 year ago
renovate[bot]	d5408dbb54	Update dependency prom-client to v15 (#27330) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	53fd28b889	Update dependency react-select to v5.7.7 (#27003) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f7b34707a8	Update babel monorepo to v7.23.2 (#27118) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	25751c653e	Update DefinitelyTyped types (non-major) (#27414) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	132204031f	Update dependency core-js to v3.33.1 (#27481) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	bb5bae186f	Update dependency webpack-merge to v5.10.0 (#27420) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	69d3318055	Update dependency rimraf to v5.0.5 (#27140) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	cd08b436ab	Update dependency sass to v1.69.4 (#27004) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6f1eb89d21	Update dependency ws to v8.14.2 (#26980) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6f429d3f1b	Update formatjs monorepo (#27416) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	773133befa	Update eslint (non-major) (#27415) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
kouhai	b24d7bb6f2	th: Merge remote-tracking branch 'glitch/main' (18eacc7a07)	1 year ago
Claire	245513d630	Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	1b70d7ed7c	Upgrade to react-router v5 (#25047) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
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`.	1 year ago
renovate[bot]	a00fc83701	Update dependency bufferutil to v4.0.8 (#27412) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	3da7afdeed	Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	5fc5a548b4	Update DefinitelyTyped types (non-major) (#27327) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	eabe839744	Update eslint (non-major) (#27328) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	53f5b27bd1	Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream	1 year ago
Claire	e9a181c52c	Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream	1 year ago
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.	1 year ago
Claire	19ebf7797e	Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	d22515861e	Update dependency @reduxjs/toolkit to v1.9.7 (#27275) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	5f2d494f0d	Update dependency react-redux to v8.1.3 (#27229) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	bad1629dcd	Update dependency core-js to v3.33.0 (#27237) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	73a92f9e7a	Update DefinitelyTyped types (non-major) (#27239) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	5393be7a21	Update eslint (non-major) to v6.7.3 (#27213) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	9b785877d2	Update DefinitelyTyped types (non-major) (#27212) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	665093a7b6	Update dependency postcss to v8.4.31 (#27199) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	66a7bc215c	Update dependency glob to v10.3.10 (#27169) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	0f588a4a86	Update dependency axios to v1.5.1 (#27159) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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>	1 year ago
Claire	abdb58840a	Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	2054ee7cd5	Update dependency glob to v10.3.9 (#27148) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	33a066a952	Update dependency glob to v10.3.8 (#27145) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	aeeddb9d46	Update DefinitelyTyped types (non-major) (#27109) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	82c44f492d	Update dependency glob to v10.3.7 (#27078) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c56d7d702f	Update dependency @reduxjs/toolkit to v1.9.6 (#27110) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	1fa40cff70	Update eslint (non-major) (#27113) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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.	1 year ago
renovate[bot]	c74670b4d3	Update dependency glob to v10.3.5 (#27002) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	4ed9d9ca6f	Update dependency autoprefixer to v10.4.16 (#27000) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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.	1 year ago
Claire	1e87575b70	Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	a83615edc9	Update eslint (non-major) (#26954) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6eb6209d02	Update DefinitelyTyped types (non-major) (#26953) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6f9f901153	Update dependency postcss to v8.4.30 (#26964) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	9688c5fcc4	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	8b5c61ae3a	Update formatjs monorepo (#26955) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	04623e2f34	Update babel monorepo to v7.22.20 (#26946) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Kouhai	9d32bdbcde	th: Merge remote-tracking branch 'glitch/main'	1 year ago
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.	1 year ago
Claire	c31020044b	Merge commit '38fe6ecd05e9349717b60452eff6e5ff4809b82b' 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.	1 year ago
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.	1 year ago
Claire	3947d7a153	Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' 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.	1 year ago
Claire	08b495d95c	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	1 year ago
Claire	296e8f791e	Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream	1 year ago
Claire	5d8c65f2a7	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	1 year ago
Claire	4127a9d9fe	Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	82015dbab6	Update dependency sass to v1.67.0 (#26914) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	720056fd25	Update dependency sass to v1.67.0 (#26914) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	3103415364	Update dependency @babel/core to v7.22.19 (#26920) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ad7033cac5	Update dependency @babel/core to v7.22.19 (#26920) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	93223633fc	Update dependency uuid to v9.0.1 (#26900) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7497b4e076	Update dependency uuid to v9.0.1 (#26900) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f3be4eb0dc	Update dependency @rails/ujs to v7.0.8 (#26871) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	0d4ed17ac9	Update dependency @rails/ujs to v7.0.8 (#26871) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	3679e67fad	Update dependency @babel/core to v7.22.17 (#26855) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	bcf10c7811	Update dependency @babel/core to v7.22.17 (#26855) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c10142ac3c	Update formatjs monorepo (#26874) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7f38582cc3	Update formatjs monorepo (#26874) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	b1d8907138	Update dependency @types/lodash to v4.14.198 (#26878) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	1efbb62024	Update dependency @types/lodash to v4.14.198 (#26878) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	959ccf5682	Update eslint (non-major) (#26881) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	2f86d3bf24	Update eslint (non-major) (#26881) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	d5155cbc21	Update dependency ws to v8.14.1 (#26862) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	595ccca12a	Update dependency ws to v8.14.1 (#26862) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	e9b528eaee	Use NodeJS v20 by default (#26830)	1 year ago
Renaud Chaput	0c43169d93	Use NodeJS v20 by default (#26830)	1 year ago
renovate[bot]	712d96b207	Update dependency ws to v8.14.0 (#26821) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	390c09a09a	Update dependency ws to v8.14.0 (#26821) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	d0f7d879a6	Update formatjs monorepo (#26844) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	640024d8d2	Update formatjs monorepo (#26844) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	858ad1f363	Update dependency core-js to v3.32.2 (#26841) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	e654e8e07e	Update dependency core-js to v3.32.2 (#26841) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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>	1 year ago
renovate[bot]	343cbc89a1	Update dependency @material-design-icons/svg to v0.14.12 (#26832) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	9e3567bfbe	Update dependency webpack to v4.47.0 (#26825) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	10d99cb5c5	Update dependency webpack to v4.47.0 (#26825) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	e66f961e05	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	ef01aa71a9	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	ddeca3b37b	Update babel monorepo to v7.22.15 (#26790) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	4533426018	Update babel monorepo to v7.22.15 (#26790) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	3e6a6439b5	Update dependency stylelint-config-standard-scss to v11 (#26780) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	1d954462bb	Update dependency stylelint-config-standard-scss to v11 (#26780) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	1f92436745	Update DefinitelyTyped types (non-major) (#26785) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f16b40332c	Update DefinitelyTyped types (non-major) (#26785) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	173041f02c	Update dependency typescript to v5.2.2 (#26786) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	e7b2092c4c	Update dependency typescript to v5.2.2 (#26786) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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.	1 year ago
Claire	63969b15b3	Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' 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.	1 year ago
Claire	ffb486648c	Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream	1 year ago
Claire	d38116d584	Merge commit 'e26e4702acadc05fca8bb550f98b4186b04d335d' into glitch-soc/merge-upstream	1 year ago
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.	1 year ago
Claire	5d5d0c06d8	Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' 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.	1 year ago
Claire	c8aa3d6d06	Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream	1 year ago
Claire	a9fb03b6c0	Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream	1 year ago
Claire	6b7c47311d	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	1 year ago
Claire	52ce0a1c1d	Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream	1 year ago
Gabriel Simmer	be991f1d18	Move to ioredis for streaming (#26581) ... Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>	1 year ago
Gabriel Simmer	8bffce5f01	Move to ioredis for streaming (#26581) ... Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>	1 year ago
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>	1 year ago
renovate[bot]	9c5bcaf188	Update dependency @babel/preset-env to v7.22.14 (#26732) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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>	1 year ago
renovate[bot]	a76a99b2bb	Update dependency webpack-bundle-analyzer to v4.9.1 (#26733) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	15949e42c2	Update dependency glob to v10.3.4 (#26734) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	1097ca5377	Update dependency glob to v10.3.4 (#26734) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	24deaf2e4a	Update dependency postcss to v8.4.29 (#26720) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6fc874631a	Update dependency postcss to v8.4.29 (#26720) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a67cf439ee	Update dependency axios to v1.5.0 (#26680) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	425af3ef0f	Update dependency axios to v1.5.0 (#26680) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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>	1 year ago
renovate[bot]	85c3155d14	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>	1 year ago
renovate[bot]	4ea5db90da	Update DefinitelyTyped types (non-major) (#26693) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c51564cc67	Update DefinitelyTyped types (non-major) (#26693) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	fc14d1f3b0	Update eslint (non-major) (#26694) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	e886929716	Update eslint (non-major) (#26694) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Kouhai	7c7355a964	th: Merge remote-tracking branch 'glitch/main' (d033fab0ed)	1 year ago
renovate[bot]	e4c0ce18a3	Update dependency immutable to v4.3.4 (#26655) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c0d98abf00	Update dependency immutable to v4.3.4 (#26655) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c66f756522	Update babel monorepo to v7.22.11 (#26640) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	3a75c0fdc3	Update babel monorepo to v7.22.11 (#26640) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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.	1 year ago
Claire	592a675a33	Merge commit '14de2ab8804ca9c765e99d5d22383cc9079c53f8' 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.	1 year ago
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.	1 year ago
Claire	2a8e55b0ee	Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' 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.	1 year ago
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.	1 year ago
Claire	17e93dbce5	Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' 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.	1 year ago
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.	1 year ago
Claire	1f30778ec6	Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' 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.	1 year ago
renovate[bot]	24ea6f851f	Update dependency redis to v4.6.8 (#26630) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	deccd70910	Update dependency redis to v4.6.8 (#26630) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	34f5b90dc7	Update dependency sass to v1.66.1 (#26534) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	d0181fc9e6	Update dependency sass to v1.66.1 (#26534) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	de8c2427a5	Update dependency immutable to v4.3.3 (#26622) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f6ce219c9d	Update dependency immutable to v4.3.3 (#26622) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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>	1 year ago
renovate[bot]	7c4e4be3c6	Update dependency react-textarea-autosize to v8.5.3 (#26607) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	10404aece8	Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream	1 year ago
Claire	c52397dea3	Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	bb2db2aec0	Add `circular-dependency-plugin` to detect any circular deps issues (#26600)	1 year ago
Renaud Chaput	78aecc7444	Add `circular-dependency-plugin` to detect any circular deps issues (#26600)	1 year ago
Claire	7e25e311d5	Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream	1 year ago
Claire	ccf5f88e43	Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	1cdcd9dc08	Update eslint (non-major) (#26567) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	d38310bed2	Update eslint (non-major) (#26567) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	d3b4422b94	Update dependency core-js to v3.32.1 (#26548) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a1aaba08a7	Update dependency core-js to v3.32.1 (#26548) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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>	1 year ago
renovate[bot]	8f40a96f28	Update dependency @material-design-icons/svg to v0.14.11 (#26536) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	b5acf13886	Update dependency pg to v8.11.3 (#26519) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	5dcf08d912	Update dependency pg to v8.11.3 (#26519) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	26eaf058e2	Update dependency postcss to v8.4.28 (#26502) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	dc779cbd55	Update dependency postcss to v8.4.28 (#26502) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c65032fb11	Update dependency autoprefixer to v10.4.15 (#26473) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7cf538f547	Update dependency autoprefixer to v10.4.15 (#26473) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	1eac3a60de	Upgrade `@types/react` (#26457)	1 year ago
Renaud Chaput	98912c5caf	Upgrade `@types/react` (#26457)	1 year ago
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Claire	33024cca51	Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Kouhai	f8028d190e	th: Merge remote-tracking branch 'glitch/main'	1 year ago
Claire	32faa7213f	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' 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	1 year ago
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	1 year ago
Renaud Chaput	121443c0fc	Upgrade JS dev dependencies (#26442)	1 year ago
Renaud Chaput	13a4a81f02	Upgrade JS dev dependencies (#26442)	1 year ago
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>	1 year ago
renovate[bot]	d28ac3caa8	Update dependency pg-connection-string to v2.6.2 (#26427) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
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>	1 year ago
renovate[bot]	adbe541e5e	Update dependency eslint-import-resolver-typescript to v3.6.0 (#26429) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7572fa21a3	Update babel monorepo to v7.22.10 (#26421) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	e530e5737a	Update babel monorepo to v7.22.10 (#26421) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	05022c9218	Update dependency pg to v8.11.2 (#26426) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	acaeaaeb6a	Update dependency pg to v8.11.2 (#26426) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	700f948fc9	Update dependency @rails/ujs to v7.0.7 (#26422) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	aa367e4058	Update dependency @rails/ujs to v7.0.7 (#26422) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	54dfacafcb	Update dependency regenerator-runtime to ^0.14.0 (#26432) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a0bed9f641	Update dependency regenerator-runtime to ^0.14.0 (#26432) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ba318a42fe	Update dependency sass to v1.65.1 (#26433) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7aba925071	Update dependency sass to v1.65.1 (#26433) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago