diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
| commit | d4b2f4dd8332701c2df0003a213b34abe0163599 (patch) | |
| tree | ec868cb769c6656bbcb4b42b65710ab72717598e /lib/banzai/renderer.rb | |
| parent | 5348985015cd0f3163ed7617eb86df63396db16b (diff) | |
| parent | 112f9710b65fe830a058366cde1734a2928764de (diff) | |
| download | gitlab-ce-pipeline_index_vue_error_state.tar.gz | |
Merge branch 'master' into pipeline_index_vue_error_statepipeline_index_vue_error_state
Diffstat (limited to 'lib/banzai/renderer.rb')
| -rw-r--r-- | lib/banzai/renderer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb index f31fb6c3f71..74663556cbb 100644 --- a/lib/banzai/renderer.rb +++ b/lib/banzai/renderer.rb @@ -52,9 +52,9 @@ module Banzai end # Same as +render_field+, but without consulting or updating the cache field - def cacheless_render_field(object, field) + def cacheless_render_field(object, field, options = {}) text = object.__send__(field) - context = object.banzai_render_context(field) + context = object.banzai_render_context(field).merge(options) cacheless_render(text, context) end |