Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
cff44b5f
Commit
cff44b5f
authored
Apr 17, 2018
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make call to 'html_escape' unambiguous
parent
a56611e3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/helpers/tree_helper.rb
app/helpers/tree_helper.rb
+1
-1
lib/banzai/renderer/common_mark/html.rb
lib/banzai/renderer/common_mark/html.rb
+1
-1
lib/banzai/renderer/redcarpet/html.rb
lib/banzai/renderer/redcarpet/html.rb
+1
-1
No files found.
app/helpers/tree_helper.rb
View file @
cff44b5f
...
@@ -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>"
}
...
...
lib/banzai/renderer/common_mark/html.rb
View file @
cff44b5f
...
@@ -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
)
...
...
lib/banzai/renderer/redcarpet/html.rb
View file @
cff44b5f
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment