2704 Commits

Author	SHA1	Message	Date
Claire	c2c3a66478	Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream	2024-09-23 20:24:18 +02:00
renovate[bot]	958f01e722	Update dependency sass to v1.79.3 (#32009) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-23 08:41:05 +00:00
renovate[bot]	c37f9c0d44	Update dependency jsdom to v25.0.1 (#32017) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-23 08:36:57 +00:00
renovate[bot]	84d04386dd	Update DefinitelyTyped types (non-major) (#32026) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-23 08:35:37 +00:00
renovate[bot]	efc0d4d526	Update dependency react-intl to v6.7.0 (#32028) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-23 08:35:11 +00:00
Claire	221bba1897	Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream	2024-09-21 15:06:06 +02:00
renovate[bot]	840fd69730	Update dependency sass to v1.79.2 (#31992) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-20 08:20:27 +00:00
renovate[bot]	09459ed000	Update dependency react-select to v5.8.1 (#31982) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-20 08:15:14 +00:00
renovate[bot]	42f9f507b6	Update dependency pg to v8.13.0 (#31949) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-18 13:29:21 +00:00
renovate[bot]	2d399f5d4a	Update dependency pg-connection-string to v2.7.0 (#31950) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-18 09:17:57 +00:00
renovate[bot]	a791274824	Update dependency sass to v1.79.1 (#31958) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-18 08:28:42 +00:00
renovate[bot]	f3f06dafe3	Update dependency babel-loader to v8.4.1 (#31931) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-18 08:05:06 +00:00
Claire	665e9129fe	Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: An upstream refactor touched lines adjacent to ones modified in glitch-soc. Ported upstream's changes.	2024-09-16 21:08:58 +02:00
renovate[bot]	c24de04f9c	Update dependency postcss to v8.4.47 (#31913) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-16 07:51:36 +00:00
renovate[bot]	9ea270526c	Update DefinitelyTyped types (non-major) (#31922) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-16 07:51:13 +00:00
renovate[bot]	2afaa3b3d4	Update dependency husky to v9.1.6 (#31923) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-16 07:50:51 +00:00
Claire	83b553c7d1	Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream	2024-09-12 21:32:39 +02:00
Claire	90d7a4bac4	Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream	2024-09-12 17:22:06 +02:00
renovate[bot]	0226bbe516	Update dependency express to v4.21.0 (#31877) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-12 14:21:06 +00:00
renovate[bot]	a27f7f4e56	Update typescript-eslint monorepo to v8 (major) (#31231) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	2024-09-11 13:59:46 +00:00
renovate[bot]	e6f5b36a12	Update dependency express to v4.20.0 (#31836) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-10 17:45:16 +00:00
Claire	441af2632d	Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream	2024-09-09 18:22:41 +02:00
renovate[bot]	1d03570080	Update dependency postcss-preset-env to v10.0.3 (#31821) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-09 11:16:09 +00:00
Claire	1a0ef0c526	Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream	2024-09-05 20:36:25 +02:00
renovate[bot]	bd8cd0c6e7	Update dependency cssnano to v7.0.6 (#31757) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-05 09:50:38 +00:00
Claire	5a55180b95	Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream ... Conflicts: - `spec/lib/sanitize/config_spec.rb`: Upstream rewrote top-level `describe` calls to `RSpec.describe`, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. Changed `describe` to `RSpec.describe` as upstream did, keeping glitch-soc's tests.	2024-09-04 19:38:52 +02:00
renovate[bot]	36710aec8b	Update dependency postcss to v8.4.45 (#31742) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-04 09:57:28 +00:00
renovate[bot]	7fb8834dd7	Update dependency pino-http to v10.3.0 (#31721) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-04 09:29:14 +00:00
renovate[bot]	44fd0803ce	Update dependency pino to v9.4.0 (#31720) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-04 09:27:12 +00:00
renovate[bot]	d8bd9ef190	Update eslint (non-major) (#31684) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-04 09:25:25 +00:00
renovate[bot]	612802b9e5	Update dependency sass to v1.78.0 (#31739) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-04 08:22:44 +00:00
Claire	402c1e116d	Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream	2024-09-02 17:43:10 +02:00
renovate[bot]	fc870c7e5a	Update dependency postcss to v8.4.44 (#31691) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-02 09:35:43 +00:00
renovate[bot]	d1cca521e1	Update devDependencies (non-major) (#31686) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-02 08:36:56 +00:00
renovate[bot]	25d5e19b83	Update DefinitelyTyped types (non-major) (#31683) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-02 08:35:51 +00:00
renovate[bot]	478155b015	Update dependency postcss to v8.4.43 (#31676) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-02 08:35:28 +00:00
renovate[bot]	1701b1fc80	Update dependency axios to v1.7.7 (#31670) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-09-02 08:26:43 +00:00
Claire	6f35e93f72	Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream	2024-08-31 16:06:04 +02:00
renovate[bot]	02633d6ebb	Update dependency jsdom to v25 (#31578) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-08-30 09:48:54 +00:00
renovate[bot]	3655e3204f	Update dependency @babel/runtime to v7.25.6 (#31649) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-08-30 09:46:53 +00:00
renovate[bot]	4f4be65452	Update dependency @rails/ujs to v7.1.400 (#31628) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-08-29 08:30:09 +00:00
Claire	11b8017b45	Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream	2024-08-26 18:52:33 +02:00
renovate[bot]	0422a5c208	Update dependency axios to v1.7.5 (#31564) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-08-26 08:44:32 +00:00
renovate[bot]	4cc589e533	Update dependency jsdom to v24.1.3 (#31577) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-08-26 07:35:53 +00:00
renovate[bot]	5bcfe8d421	Update dependency @types/react to v18.3.4 (#31586) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-08-26 07:34:16 +00:00
renovate[bot]	a6906e045b	Update devDependencies (non-major) (#31587) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-08-26 07:34:01 +00:00
Claire	18556d3e9b	Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Upstream refactored some helpers and moved them in another file. Not a real conflict, but glitch-soc had adjacent glitch-only definitions. Kept glitch-soc definitions where they are and moved upstream ones as upstream did.	2024-08-22 19:54:20 +02:00
renovate[bot]	61d9704f6d	Update babel monorepo to v7.25.4 (#31542) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-08-22 11:51:30 +00:00
Claire	f5c0c32edd	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/material-icons/400-24px/chat.svg`: Glitch-soc used this one but not upstream. Upstream pulled a presumably more up-to-date version of the file. Switched to upstream's version. - `app/views/layouts/application.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/embedded.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/error.html.haml`: Upstream removed use of font-awesome. I hope we are ready.	2024-08-20 18:31:50 +02:00
Matt Jankowski	4c4bcad866	Remove font-awesome npm package (#31512)	2024-08-20 15:59:47 +00:00