Claire e7ee3a997c Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added fallback behavior for when the admin-set theme does not exist.
  Glitch-soc has a different theming system, but already had similar fallback,
  so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
  Upstream adapted existing tests for the new fallback behavior, and added some
  tests accordingly.
  Glitch-soc has a different theming system, adapted the new tests accordingly.

2026-04-20 18:51:00 +02:00

..

admin

Add ContentPoliciesHelper#policy_list to wrap string building in views (#37856)

2026-02-13 15:54:41 +00:00

accounts_helper_spec.rb

Remove remnants of embed views (#32419)

2024-11-16 20:48:10 +00:00

application_helper_spec.rb

Fix relative sign-up path in e-mail subscription notification (#38527)

2026-04-02 11:14:42 +00:00

database_helper_spec.rb

Add coverage for DatabaseHelper primary/replica methods (#32642)

2024-10-24 08:04:29 +00:00

filters_helper_spec.rb

Extract filter_keywords helper method for listing filter keyword groups (#35921)

2025-12-17 14:48:58 +00:00

flashes_helper_spec.rb

…

formatting_helper_spec.rb

Reduce factory creation across spec/helpers (#35527)

2025-12-16 15:26:04 +00:00

home_helper_spec.rb

Reduce factory creation across spec/helpers (#35527)

2025-12-16 15:26:04 +00:00

instance_helper_spec.rb

…

json_ld_helper_spec.rb

Rescue JSON::ParserError where already converted (#38244)

2026-03-17 08:57:10 +00:00

languages_helper_spec.rb

Add coverage for valid_locale_or_nil languages helper method (#34866)

2025-07-02 07:34:42 +00:00

media_component_helper_spec.rb

Reduce factory creation across spec/helpers (#35527)

2025-12-16 15:26:04 +00:00

react_component_helper_spec.rb

…

routing_helper_spec.rb

…

self_destruct_helper_spec.rb

Move self destruct check to config_for and add constant for verifier string (#32943)

2024-11-18 09:57:16 +00:00

settings_helper_spec.rb

Pull user settings defaults from configuration (#38592)

2026-04-17 08:31:37 +00:00

statuses_helper_spec.rb

Reduce factory creation across spec/helpers (#35527)

2025-12-16 15:26:04 +00:00

theme_helper_spec.rb

Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream

2026-04-20 18:51:00 +02:00