Claire b3542ac57b Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README.

2024-01-02 13:35:11 +01:00

..

chewy

Clamp dates when serializing to Elasticsearch API (#28081)

2023-11-27 13:25:54 +00:00

controllers

Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream

2024-01-02 13:35:11 +01:00

helpers

Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream

2023-12-21 19:31:12 +01:00

javascript

Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream

2024-01-02 13:35:11 +01:00

lib

Merge branch 'main' into glitch-soc/merge-upstream

2023-12-28 16:57:10 +01:00

mailers

Fix rails mailer preview not honouring locale (#28418)

2023-12-18 21:49:17 +00:00

models

Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream

2023-12-29 17:40:57 +01:00

policies

Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' 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 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream

2023-12-21 19:24:10 +01:00

services

Merge branch 'main' into glitch-soc/merge-upstream

2023-12-28 16:57:10 +01:00

validators

Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream

2023-12-19 20:51:37 +01:00

views

Merge branch 'main' into glitch-soc/merge-upstream

2023-12-28 16:57:10 +01:00

workers

Merge branch 'main' into glitch-soc/merge-upstream

2023-12-28 16:57:10 +01:00