Merge branch 'katex-math-fixup' into 'master'

Don't open Asciidoc module twice See merge request !8119
2016-12-16 00:35:58 +00:00 · 2016-12-16 00:35:58 +00:00 · 0193822d5d
parent b562633e61 de0dfb10d4
commit 0193822d5d
1 changed files with 0 additions and 4 deletions
--- 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