Read about our upcoming Code of Conduct on this issue

Commit a5bb85f8 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'rescue-syntax-highlighting-errors-updated' into 'master'

Add comments and clean up test for !1274

See merge request !1279
......@@ -24,6 +24,8 @@ def highlight_node(node)
begin
highlighted = block_code(code, language)
rescue
# Gracefully handle syntax highlighter bugs/errors to ensure
# users can still access an issue/comment/etc.
highlighted = "<pre>#{code}</pre>"
end
......
......@@ -4,9 +4,6 @@ module Gitlab::Markdown
describe SyntaxHighlightFilter do
include FilterSpecHelper
let(:project) { create(:empty_project) }
let(:reference) { snippet.to_reference }
it 'highlights valid code blocks' do
result = filter('<pre><code>def fun end</code>')
expect(result.to_html).to eq("<pre class=\"code highlight js-syntax-highlight plaintext\"><code>def fun end</code></pre>\n")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment