diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-21 21:23:51 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-21 21:25:30 +0300 |
| commit | ef54aa69a3c4245d1d420c5ce3a95da1393d70b5 (patch) | |
| tree | 270d3c8929c2e4f810e1fb140db1091816ee4359 /app/helpers/gitlab_markdown_helper.rb | |
| parent | 82eed5f12cf38d7627cc1aecbd6886046225ccd4 (diff) | |
Merge branch 'remove-banzai-pre-process' into 'master'
Move pre_process into render_result
This MR moves `Banzai::Renderer.pre_process` into `Banzai::Renderer.render_result`.
The `pre_process` method was called even when its output would be ignored. See 11a5a4f359ee57029dbfcc9185fc6b47243ea2aa for more details.
See merge request !4830
Diffstat (limited to 'app/helpers/gitlab_markdown_helper.rb')
| -rw-r--r-- | app/helpers/gitlab_markdown_helper.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index 067a00660aa..09a429a9034 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -50,8 +50,6 @@ module GitlabMarkdownHelper context[:project] ||= @project - text = Banzai.pre_process(text, context) - html = Banzai.render(text, context) context.merge!( |