summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-07 13:12:14 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-07 13:12:14 +0000
commitfc65f56399796c2b6698597f5df3d8ea343d1a77 (patch)
treefcbd8500978dc305143db0c474b9e28a82d78067 /config
parent0bae567369e51c9a8590101633adf435066ac18d (diff)
parentaa60db6cee8e285a39077c567c7f59fecbd0e0a3 (diff)
downloadgitlab-ce-fc65f56399796c2b6698597f5df3d8ea343d1a77.tar.gz
Merge branch 'replace_redcarpet_with_cmark' into 'master'
Add CommonMark markdown engine See merge request gitlab-org/gitlab-ce!14835
Diffstat (limited to 'config')
-rw-r--r--config/initializers/8_metrics.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb
index 45b39b2a38d..7cdf49159b4 100644
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
@@ -94,6 +94,7 @@ def instrument_classes(instrumentation)
instrumentation.instrument_instance_methods(RepositoryCheck::SingleRepositoryWorker)
+ instrumentation.instrument_instance_methods(Rouge::Plugins::CommonMark)
instrumentation.instrument_instance_methods(Rouge::Plugins::Redcarpet)
instrumentation.instrument_instance_methods(Rouge::Formatters::HTMLGitlab)