diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-16 00:35:58 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-16 00:35:58 +0000 |
| commit | 0193822d5dd4062e9c631ce4866ec7316a045fd0 (patch) | |
| tree | 43bdaf82e4c5b0f5a2a655badf886cbd17f18682 | |
| parent | b562633e61c7d14dfa8b45b5819ac2f08750d961 (diff) | |
| parent | de0dfb10d47da609b3cca1f0e5310c14e5b1572c (diff) | |
| download | gitlab-ce-0193822d5dd4062e9c631ce4866ec7316a045fd0.tar.gz | |
Merge branch 'katex-math-fixup' into 'master'
Don't open Asciidoc module twice
See merge request !8119
| -rw-r--r-- | lib/gitlab/asciidoc.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb index f77f412da56..fa234284361 100644 --- a/lib/gitlab/asciidoc.rb +++ b/lib/gitlab/asciidoc.rb @@ -35,11 +35,7 @@ module Gitlab html.html_safe end - end -end -module Gitlab - module Asciidoc class Html5Converter < Asciidoctor::Converter::Html5Converter extend Asciidoctor::Converter::Config |