4492 Commits (166d4124141425d5c4d7c7fd1f512b94f1611d39)

Author	SHA1	Message	Date
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
renovate[bot]	c645308c6e	Update dependency eslint-config-prettier to v9 (#26434) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	78760a80f2	Update dependency eslint-config-prettier to v9 (#26434) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	74c422ad0a	Update dependency immutable to v4.3.2 (#26425) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	37b6cf54bc	Update dependency immutable to v4.3.2 (#26425) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	26fa4a6e82	Update eslint (non-major) (#26323) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	84dcc0d054	Update eslint (non-major) (#26323) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	59678c6d5d	Update dependency sass to v1.64.2 (#26315) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	2a6e6dc53c	Update dependency sass to v1.64.2 (#26315) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Emelia Smith	65096c1ccd	Change streaming `/metrics` to include additional metrics (#26299)	1 year ago
Emelia Smith	b92b2b1298	Change streaming `/metrics` to include additional metrics (#26299)	1 year ago
renovate[bot]	f6e4137d7c	Update dependency core-js to v3.32.0 (#26317) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	22c70db671	Update dependency core-js to v3.32.0 (#26317) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	670dae371a	Update dependency react-redux to v8.1.2 (#26314) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	4c38e087dd	Update dependency react-redux to v8.1.2 (#26314) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Eugen Rochko	9a214a414e	Change design of role badges in web UI (#26281) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Eugen Rochko	2cbdff97ce	Change design of role badges in web UI (#26281) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	f55959ebd9	Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	1 year ago
Claire	bd349cb850	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	1 year ago
renovate[bot]	ecfcdbbd6f	Update dependency sass to v1.64.1 (#26146) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	edc104c9ef	Update dependency sass to v1.64.1 (#26146) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	d268a0cdcf	Update dependency postcss to v8.4.27 (#26144) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	3cbc69f13d	Update dependency postcss to v8.4.27 (#26144) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	cb70bb8665	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.	1 year ago
Claire	c04f2d0cf7	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.	1 year ago
renovate[bot]	877ea733b2	Update dependency react-select to v5.7.4 (#26033) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	2a9063e36a	Update dependency react-select to v5.7.4 (#26033) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	0ef1efbe71	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	c943f17b1b	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	42f670c82d	Update dependency postcss to v8.4.26 (#26030) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7b7a26c895	Update dependency postcss to v8.4.26 (#26030) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	20537e068f	Update dependency immutable to v4.3.1 (#26029) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f17acbca33	Update dependency immutable to v4.3.1 (#26029) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	0d0f6bc223	Update babel monorepo to v7.22.9 (#26017) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	cdaca7a08b	Update babel monorepo to v7.22.9 (#26017) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	3c714ea3d2	Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream	1 year ago
Claire	25571b18ed	Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream	1 year ago
Claire	268e955aef	Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/roboto-mono.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file. - `app/javascript/styles/fonts/roboto.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file.	1 year ago
Claire	95a1fde6b6	Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/roboto-mono.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file. - `app/javascript/styles/fonts/roboto.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file.	1 year ago
Claire	c6212d89f8	Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.	1 year ago
Claire	2d09653d50	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.	1 year ago
renovate[bot]	725b27379e	Update dependency postcss to v8.4.25 (#25961) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ba0649f042	Update dependency postcss to v8.4.25 (#25961) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7ca72cab0e	Update dependency react-textarea-autosize to v8.5.2 (#25962) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a4e6ff0d53	Update dependency react-textarea-autosize to v8.5.2 (#25962) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	a09ed92a77	Upgrade to `typescript-eslint` v6 (#25904)	1 year ago
Renaud Chaput	a7253075d1	Upgrade to `typescript-eslint` v6 (#25904)	1 year ago
Renaud Chaput	9094a65fd4	Upgrade to Prettier 3 (#25902)	1 year ago
Renaud Chaput	73b64b8917	Upgrade to Prettier 3 (#25902)	1 year ago
renovate[bot]	9e6c02fd81	Update dependency glob to v10.3.3 (#25959) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	0d7340380c	Update dependency glob to v10.3.3 (#25959) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	31519eee55	Update dependency core-js to v3.31.1 (#25958) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6be9f95a22	Update dependency core-js to v3.31.1 (#25958) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Matt Jankowski	5cdc196e44	Rails 7.0 update (#25668)	1 year ago
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