summaryrefslogtreecommitdiff
path: root/app/views/projects/wikis
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-09-08 17:17:37 +0000
committerRobert Speicher <robert@gitlab.com>2015-09-08 17:17:37 +0000
commitdf1f4433c57abb0eebbd091ac6247974d338cda6 (patch)
treee4e130dd371edd9157405042ea7f4142d5e0b55a /app/views/projects/wikis
parent86556a079e34eb1267e63f7b39cc018665e21bfc (diff)
parent9f31f95adad5500045ef35b57d133c633cd08524 (diff)
downloadgitlab-ce-df1f4433c57abb0eebbd091ac6247974d338cda6.tar.gz
Merge branch 'mr-xss' into 'master'
Escape user-provided content in preserved HAML sections See merge request !1927
Diffstat (limited to 'app/views/projects/wikis')
-rw-r--r--app/views/projects/wikis/git_access.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index 62071e29d74..226fd3b2290 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -21,7 +21,7 @@
%pre.dark
:preserve
git clone #{ content_tag(:span, default_url_to_repo(@project_wiki), class: 'clone')}
- cd #{@project_wiki.path}
+ cd #{h @project_wiki.path}
%legend Start Gollum And Edit Locally:
%pre.dark