summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-17 17:02:16 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-17 17:02:16 +0000
commitba21be7f1d4c8fc99412274a70c89a1c83d0331f (patch)
treea48ff0443d7c7ce026cb9cd252ab5c1a2253a22d /config
parentf64a639bcfa1fc2bc89ca7db268f594306edfd7c (diff)
downloadgitlab-ce-ba21be7f1d4c8fc99412274a70c89a1c83d0331f.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/initializers/kramdown_patch.rb25
1 files changed, 25 insertions, 0 deletions
diff --git a/config/initializers/kramdown_patch.rb b/config/initializers/kramdown_patch.rb
new file mode 100644
index 00000000000..5cb769cec24
--- /dev/null
+++ b/config/initializers/kramdown_patch.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+#
+# This pulls in https://github.com/gettalong/kramdown/pull/708 for kramdown v2.3.0.
+# Remove this file when that pull request is merged and released.
+require 'kramdown/converter'
+require 'kramdown/converter/syntax_highlighter/rouge'
+
+module Kramdown::Converter::SyntaxHighlighter
+ module Rouge
+ def self.formatter_class(opts = {})
+ case formatter = opts[:formatter]
+ when Class
+ formatter
+ when /\A[[:upper:]][[:alnum:]_]*\z/
+ ::Rouge::Formatters.const_get(formatter, false)
+ else
+ # Available in Rouge 2.0 or later
+ ::Rouge::Formatters::HTMLLegacy
+ end
+ rescue NameError
+ # Fallback to Rouge 1.x
+ ::Rouge::Formatters::HTML
+ end
+ end
+end