diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-06-01 18:25:56 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-06-01 18:25:56 +0000 |
| commit | f45007ed211f97a416bd9362b88ab450bd618e02 (patch) | |
| tree | 80cd24b9c0ed31e1f65bef353561580b286484d2 /app/helpers/markup_helper.rb | |
| parent | 46446d3c712db4f42babb21c454df43f2167847a (diff) | |
| parent | e1e95e4aa59a01ea53c41f68ec6a099d41d2a838 (diff) | |
| download | gitlab-ce-13-10-stable.tar.gz | |
Merge remote-tracking branch 'dev/13-10-stable' into 13-10-stable13-10-stable
Diffstat (limited to 'app/helpers/markup_helper.rb')
| -rw-r--r-- | app/helpers/markup_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index ad206d0e5b5..6c19fcc9121 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -118,6 +118,7 @@ module MarkupHelper def markup(file_name, text, context = {}) context[:project] ||= @project + context[:text_source] ||= :blob html = context.delete(:rendered) || markup_unsafe(file_name, text, context) prepare_for_rendering(html, context) end |