diff options
author | Stan Hu <stanhu@gmail.com> | 2015-09-10 14:21:14 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-09-10 14:24:10 -0700 |
commit | 267687993a437e0651eb5064c04479e65a43251f (patch) | |
tree | af67be0c81836856d3c810cc1f43687691f553b6 | |
parent | b2f3d024c3775f9d8dc293c433da103381ed6e45 (diff) | |
download | gitlab-ce-267687993a437e0651eb5064c04479e65a43251f.tar.gz |
Add comments and clean up test for !1274
-rw-r--r-- | lib/gitlab/markdown/syntax_highlight_filter.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/markdown/syntax_highlight_filter.rb b/lib/gitlab/markdown/syntax_highlight_filter.rb index f9527c7286e..8597e02f0de 100644 --- a/lib/gitlab/markdown/syntax_highlight_filter.rb +++ b/lib/gitlab/markdown/syntax_highlight_filter.rb @@ -24,6 +24,8 @@ module Gitlab 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 diff --git a/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb b/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb index ecef31853f4..6a490673728 100644 --- a/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb +++ b/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb @@ -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") |