Merge commit '624c024766227255c78d31bd408876c64a8b279f' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream added an optional keyword argument where glitch-soc already had one for content-type.
  Added upstream's new option while keeping glitch-soc's.

app/lib/advanced_text_formatter.rb

@@ -50,6 +50,8 @@ class AdvancedTextFormatter < TextFormatter
       end
     end
 
+    html = add_quote_fallback(html) if options[:quoted_status].present?
+
     html.html_safe # rubocop:disable Rails/OutputSafety
   end