Claire 60298af3c4 Merge commit 'c6684aa1e3' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack.		2024-01-15 20:01:36 +01:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit 'a90696011e' into glitch-soc/merge-upstream	2024-01-15 19:19:04 +01:00
helpers	Merge commit '2954279e9c' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +01:00
javascript	Merge commit 'c6684aa1e3' into glitch-soc/merge-upstream	2024-01-15 20:01:36 +01:00
lib	Merge commit '9a73a7dcaf' into glitch-soc/merge-upstream	2024-01-11 12:59:27 +01:00
mailers	Fix rails mailer preview not honouring locale (#28418)	2023-12-18 21:49:17 +00:00
models	Merge commit '0a7cff53c2' into glitch-soc/merge-upstream	2024-01-11 13:24:20 +01:00
policies	Merge commit '272592d16d' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
presenters	Fix call to inefficient delete_matched cache method in domain blocks (#28374)	2023-12-18 16:14:43 +00:00
serializers	Merge commit 'fe2667bb0d' into glitch-soc/merge-upstream	2024-01-10 17:51:12 +01:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
validators	Merge commit 'fe2667bb0d' into glitch-soc/merge-upstream	2024-01-10 17:51:12 +01:00
views	Merge commit 'c6684aa1e3' into glitch-soc/merge-upstream	2024-01-15 20:01:36 +01:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00