diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-12 11:39:58 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-12 11:39:58 +0300 |
| commit | 9ec3a8b0847c613f42fffd11917c04a4c2e8294a (patch) | |
| tree | a2847c2870f2ba184495ac3a3e641d89022b3ee6 /app/helpers | |
| parent | ef44ebf8e363c93b0c2531690003cd4f7b2cfab1 (diff) | |
| parent | daad7144ec7c0173439eeadd61590442e40a6051 (diff) | |
Merge branch 'rendering-markdown-multiple-projects' into 'master'
Optimise rendering of Markdown documents that belong to different projects
See merge request gitlab-org/gitlab-ce!18157
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/markup_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 2fe1927a189..39e7a7fd396 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -256,7 +256,7 @@ module MarkupHelper return '' unless html.present? context.merge!( - current_user: (current_user if defined?(current_user)), + current_user: (current_user if defined?(current_user)), # RelativeLinkFilter commit: @commit, |