Commit cff44b5f authored by Brett Walker's avatar Brett Walker

make call to 'html_escape' unambiguous

parent a56611e3
...@@ -90,7 +90,7 @@ module TreeHelper ...@@ -90,7 +90,7 @@ module TreeHelper
end end
def commit_in_single_accessible_branch 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 "\ message = _("Your changes can be committed to %{branch_name} because a merge "\
"request is open.") % { branch_name: "<strong>#{branch_name}</strong>" } "request is open.") % { branch_name: "<strong>#{branch_name}</strong>" }
......
...@@ -9,7 +9,7 @@ module Banzai ...@@ -9,7 +9,7 @@ module Banzai
lang_attr = lang.present? ? %Q{ lang="#{lang}"} : '' lang_attr = lang.present? ? %Q{ lang="#{lang}"} : ''
result = result =
"<pre>" \ "<pre>" \
"<code#{lang_attr}>#{html_escape(code)}</code>" \ "<code#{lang_attr}>#{ERB::Util.html_escape(code)}</code>" \
"</pre>" "</pre>"
out(result) out(result)
......
...@@ -6,7 +6,7 @@ module Banzai ...@@ -6,7 +6,7 @@ module Banzai
lang_attr = lang ? %Q{ lang="#{lang}"} : '' lang_attr = lang ? %Q{ lang="#{lang}"} : ''
"\n<pre>" \ "\n<pre>" \
"<code#{lang_attr}>#{html_escape(code)}</code>" \ "<code#{lang_attr}>#{ERB::Util.html_escape(code)}</code>" \
"</pre>" "</pre>"
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment