Claire 630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream ...

Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.

2024-01-11 12:59:27 +01:00

..

chewy

Clamp dates when serializing to Elasticsearch API (#28081)

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

controllers

Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream

2024-01-10 17:51:12 +01:00

helpers

Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream

2024-01-11 12:59:27 +01:00

javascript

Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream

2024-01-11 12:59:27 +01:00

lib

Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' 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 '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream

2024-01-11 12:59:27 +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 'fe2667bb0d3487a32b9da5250402a90482a85fe2' 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 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream

2024-01-10 17:51:12 +01:00

views

Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream

2024-01-10 18:41:04 +01:00

workers

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

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