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.

config/initializers/simple_form.rb

@@ -5,7 +5,7 @@
 module AppendComponent
   def append(_wrapper_options = nil)
     @append ||= begin
-      options[:append].to_s.html_safe if options[:append].present?
+      options[:append].to_s.html_safe if options[:append].present? # rubocop:disable Rails/OutputSafety
     end
   end
 end
@@ -24,7 +24,7 @@ end
 module WarningHintComponent
   def warning_hint(_wrapper_options = nil)
     @warning_hint ||= begin
-      options[:warning_hint].to_s.html_safe if options[:warning_hint].present?
+      options[:warning_hint].to_s.html_safe if options[:warning_hint].present? # rubocop:disable Rails/OutputSafety
     end
   end
 end