diff options
| author | ThibG <thib@sitedethib.com> | 2020-09-01 17:36:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 17:36:30 +0200 |
| commit | d967251fdc3826ad27d30e55258cfa4cdfd7c871 (patch) | |
| tree | 91926ccaedf470bfef058cc7156f9f362d46186a /app/lib/formatter.rb | |
| parent | d95dd3883e0c7d1626f5e3b88d24af2627a641e2 (diff) | |
| parent | 787a629b8f1df4cce53a9de7f3aa668cc9ef632f (diff) | |
Merge pull request #1417 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |