summaryrefslogtreecommitdiff
path: root/lib/banzai.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-11-06 16:52:59 +0000
committerDouwe Maan <douwe@gitlab.com>2017-11-06 16:52:59 +0000
commitc76426fc640d1d214d78e343c463636dcf68fa6c (patch)
treef596c4876cd50bf13afd1f3e60ccd57640b61656 /lib/banzai.rb
parent34a205b308d80d600c5651cfb9694f978ef01cab (diff)
parentbf0331dc72db658b012d58e33ca47da6d8f99d46 (diff)
downloadgitlab-ce-c76426fc640d1d214d78e343c463636dcf68fa6c.tar.gz
Merge branch '27375-dashboard-activity-performance' into 'master'
Resolve "DashboardController#activity.json is slow due to SQL" Closes #27375 See merge request gitlab-org/gitlab-ce!14985
Diffstat (limited to 'lib/banzai.rb')
-rw-r--r--lib/banzai.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai.rb b/lib/banzai.rb
index 35ca234c1ba..5df98f66f3b 100644
--- a/lib/banzai.rb
+++ b/lib/banzai.rb
@@ -3,8 +3,8 @@ module Banzai
Renderer.render(text, context)
end
- def self.render_field(object, field)
- Renderer.render_field(object, field)
+ def self.render_field(object, field, context = {})
+ Renderer.render_field(object, field, context)
end
def self.cache_collection_render(texts_and_contexts)