Claire 23ce6d326c Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream removed OTel instrumentation around some code modified in glitch-soc
  because of the Markdown rendering feature.
  Removed the OTel instrumentation as upstream did.

2025-06-03 18:34:37 +02:00

..

admin

Fix handling of malformed/unusual HTML (#34201)

2025-03-18 14:50:41 +00:00

accounts_helper.rb

Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream

2024-09-12 20:05:08 +02:00

application_helper.rb

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

2025-05-25 14:36:51 +02:00

authorized_fetch_helper.rb

Fix Setting.authorized_fetch not being properly taken into consideration (#26958)

2023-09-18 09:37:29 +02:00

branding_helper.rb

Remove image_pack_tag usage (#29925)

2024-04-15 09:05:19 +00:00

context_helper.rb

Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream

2025-05-03 18:03:42 +02:00

database_helper.rb

Fix ActiveRecord using two connection pools when no replica is defined (#27061)

2023-09-22 16:01:59 +02:00

domain_control_helper.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

email_helper.rb

…

filters_helper.rb

Extract helper methods for labels from filters/_filter_fields (#27574)

2023-11-29 10:02:59 +00:00

flashes_helper.rb

…

formatting_helper.rb

Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream

2025-06-03 18:34:37 +02:00

home_helper.rb

…

instance_helper.rb

Add icon field to instance endpoint (#30205)

2024-08-22 10:04:27 +00:00

invites_helper.rb

Fix haml-lint InstanceVariables rule for invites/_form (#26064)

2023-09-28 15:40:28 +02:00

json_ld_helper.rb

Add support for importing embedded self-quotes (#34584)

2025-05-05 08:01:16 +00:00

languages_helper.rb

Fix tl language native name (#32606)

2024-10-22 08:41:40 +00:00

media_component_helper.rb

Drop support for ruby 3.1 (#32363)

2024-10-31 15:12:08 +00:00

react_component_helper.rb

Move direct serializer usage out of admin view partial (#29028)

2024-02-06 13:18:37 +00:00

registration_helper.rb

Use enum-generated IpBlock.severity... scopes (#31210)

2024-11-08 14:23:52 +00:00

routing_helper.rb

Convert from Webpack to Vite (#34450)

2025-05-16 13:26:12 +00:00

self_destruct_helper.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.rb

Only show recently used tags hint when they are present (#32120)

2024-09-27 08:18:42 +00:00

statuses_helper.rb

Remove remnants of embed views (#32419)

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

theme_helper.rb

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

2025-05-25 14:36:51 +02:00