Claire 7839c8d9af Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream simplified `theme_style_tags`. Our version is different because of
  the different theming system.
  Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
  Theming system.

2026-01-16 23:22:19 +01:00

..

chewy

…

controllers

Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream

2026-01-14 20:31:42 +01:00

helpers

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

2026-01-16 23:22:19 +01:00

inputs

Rely on locale for options order in DOB input (#36895)

2025-12-05 15:21:22 +00:00

javascript

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

2026-01-16 23:22:19 +01:00

lib

Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream

2026-01-14 20:31:42 +01:00

mailers

…

models

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

2026-01-12 21:00:14 +01:00

policies

Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream

2026-01-14 20:31:42 +01:00

presenters

Refactor relation preloading (#37217)

2025-12-15 07:35:46 +00:00

serializers

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

2026-01-12 21:00:14 +01:00

services

Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main

2026-01-13 18:30:48 +01:00

validators

…

views

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

2026-01-16 23:22:19 +01:00

workers

Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main

2026-01-13 18:30:48 +01:00