summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-06 13:26:02 +0100
committerDouwe Maan <douwe@gitlab.com>2016-01-06 13:26:02 +0100
commitcf19efec3ac0ab4510359dd71df3d511762230c3 (patch)
treebcb0686f6770301c4de6913d27cfc79bd32f364b
parentb9ed3961b55cf3dbc1a6d4c841d295dd23161c90 (diff)
downloadgitlab-ce-cf19efec3ac0ab4510359dd71df3d511762230c3.tar.gz
Revert "Temporarily disable Markdown caching"
This reverts commit d337d5e7137d9b3fd0f9b8890a3ba9296323acc7.
-rw-r--r--lib/banzai/renderer.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb
index 115ae914524..891c0fd7749 100644
--- a/lib/banzai/renderer.rb
+++ b/lib/banzai/renderer.rb
@@ -1,7 +1,5 @@
module Banzai
module Renderer
- CACHE_ENABLED = false
-
# Convert a Markdown String into an HTML-safe String of HTML
#
# Note that while the returned HTML will have been sanitized of dangerous
@@ -20,7 +18,7 @@ module Banzai
cache_key = context.delete(:cache_key)
cache_key = full_cache_key(cache_key, context[:pipeline])
- if cache_key && CACHE_ENABLED
+ if cache_key
Rails.cache.fetch(cache_key) do
cacheless_render(text, context)
end