diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-16 18:06:01 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-16 18:06:01 +0000 |
commit | d89216ee3aff33a7f74bd1a3ed9370de53575098 (patch) | |
tree | 919ca7ceb86143f5747744e422844014920e3fde | |
parent | 3321f694b83a9d17f42cceb9987ee4a33dcf88a7 (diff) | |
parent | d337d5e7137d9b3fd0f9b8890a3ba9296323acc7 (diff) | |
download | gitlab-ce-d89216ee3aff33a7f74bd1a3ed9370de53575098.tar.gz |
Merge branch 'disable-markdown-cache' into 'master'
Temporarily disable Markdown caching
See merge request !2120
-rw-r--r-- | lib/banzai/renderer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb index 891c0fd7749..115ae914524 100644 --- a/lib/banzai/renderer.rb +++ b/lib/banzai/renderer.rb @@ -1,5 +1,7 @@ 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 @@ -18,7 +20,7 @@ module Banzai cache_key = context.delete(:cache_key) cache_key = full_cache_key(cache_key, context[:pipeline]) - if cache_key + if cache_key && CACHE_ENABLED Rails.cache.fetch(cache_key) do cacheless_render(text, context) end |