Merge branch 'main' of https://github.com/mastodon/mastodon into features/main

2023-08-14 14:25:03 +00:00
parent d0e17499d5 c48506d8d4
commit c0cf1ebdd3
764 changed files with 17703 additions and 21383 deletions
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -79,7 +79,7 @@ class TextFormatter
      entity[:indices].first
    end

-    result = ''.dup
+    result = +''

    last_index = entities.reduce(0) do |index, entity|
      indices = entity[:indices]