Skip to content
Snippets Groups Projects
Commit e86923eb authored by Sean McGivern's avatar Sean McGivern
Browse files

Merge branch...

Merge branch '45436-markdown-is-not-rendering-error-loading-viewer-undefined-method-html_escape' into 'master'

Resolve "Markdown is not rendering, "Error loading viewer": undefined method `html_escape'"

Closes #45436

See merge request gitlab-org/gitlab-ce!18418
parents bcd89dcd 11ec2f75
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -90,7 +90,7 @@ module TreeHelper
end
 
def commit_in_single_accessible_branch
branch_name = html_escape(selected_branch)
branch_name = ERB::Util.html_escape(selected_branch)
 
message = _("Your changes can be committed to %{branch_name} because a merge "\
"request is open.") % { branch_name: "<strong>#{branch_name}</strong>" }
Loading
Loading
---
title: Fix undefined `html_escape` method during markdown rendering
merge_request: 18418
author:
type: fixed
Loading
Loading
@@ -9,7 +9,7 @@ module Banzai
lang_attr = lang.present? ? %Q{ lang="#{lang}"} : ''
result =
"<pre>" \
"<code#{lang_attr}>#{html_escape(code)}</code>" \
"<code#{lang_attr}>#{ERB::Util.html_escape(code)}</code>" \
"</pre>"
 
out(result)
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ module Banzai
lang_attr = lang ? %Q{ lang="#{lang}"} : ''
 
"\n<pre>" \
"<code#{lang_attr}>#{html_escape(code)}</code>" \
"<code#{lang_attr}>#{ERB::Util.html_escape(code)}</code>" \
"</pre>"
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment