diff options
| author | Starfall <us@starfall.systems> | 2020-09-02 01:15:02 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-09-02 01:15:02 -0500 |
| commit | fd0b806603dbd632d259d06af789c7195c7264dc (patch) | |
| tree | a9ba1b09763ca15a96f927e361bb878b9833bc7d /app/lib/formatter.rb | |
| parent | a43c1d3f56c128c992f34b8e2b968de14e02ac48 (diff) | |
| parent | d967251fdc3826ad27d30e55258cfa4cdfd7c871 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/lib/formatter.rb')
| -rw-r--r-- | app/lib/formatter.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 051f27408..c0f7866bf 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -198,6 +198,7 @@ class Formatter end end + # rubocop:disable Metrics/BlockNesting def encode_custom_emojis(html, emojis, animate = false) return html if emojis.empty? @@ -252,6 +253,7 @@ class Formatter html end + # rubocop:enable Metrics/BlockNesting def rewrite(text, entities, keep_html = false) text = text.to_s |