Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.

2024-07-15 18:51:38 +02:00

..

chewy

Clamp dates when serializing to Elasticsearch API (#28081)

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

controllers

Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream

2024-07-14 18:43:35 +02:00

helpers

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

2024-07-15 18:51:38 +02:00

javascript

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

2024-07-15 18:51:38 +02:00

lib

Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream

2024-07-10 16:58:06 +02:00

mailers

Remove duplicate method def ApplicationHelper#instance_presenter (#30331)

2024-05-17 08:29:13 +00:00

models

Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream

2024-07-14 18:43:35 +02:00

policies

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

2024-05-20 12:17:36 +02:00

presenters

Fix repetitive database queries from #30040 (#30259)

2024-05-15 09:38:16 +00:00

serializers

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

2024-07-15 18:51:38 +02:00

services

Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream

2024-07-09 20:39:09 +02:00

validators

Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream

2024-06-06 12:27:26 +02:00

views

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

2024-07-12 13:41:54 +02:00

workers

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

2024-05-29 17:03:24 +02:00