diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-14 14:34:31 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-14 16:24:02 +0200 |
| commit | c5bf8e362ce10e52428bda873eb14b41e15a1bd0 (patch) | |
| tree | c0fed7299564564c78e52ab9634adaab427137c1 | |
| parent | fd2b79b6646f9b621a5e30058a09423a8cdb6c49 (diff) | |
| download | gitlab-ce-fix-banzai-renderer-instrumentation.tar.gz | |
Use module_function in Banzai::Rendererfix-banzai-renderer-instrumentation
Using `extend self` prevents GitLab Performance Monitoring from being
able to track class methods.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23347
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/banzai/renderer.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4f2f74a7595..d2f1501bd2a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 8.13.0 (unreleased) - Add an example for testing a phoenix application with Gitlab CI in the docs (Manthan Mallikarjun) - Updating verbiage on git basics to be more intuitive - Clarify documentation for Runners API (Gennady Trafimenkov) + - The instrumentation for Banzai::Renderer has been restored - Change user & group landing page routing from /u/:username to /:username - Prevent running GfmAutocomplete setup for each diff note !6569 - Added documentation for .gitattributes files diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb index 6924a293da8..ce048a36fa0 100644 --- a/lib/banzai/renderer.rb +++ b/lib/banzai/renderer.rb @@ -1,6 +1,6 @@ module Banzai module Renderer - extend self + module_function # Convert a Markdown String into an HTML-safe String of HTML # @@ -141,8 +141,6 @@ module Banzai end.html_safe end - private - def cacheless_render(text, context = {}) Gitlab::Metrics.measure(:banzai_cacheless_render) do result = render_result(text, context) |