diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-10 18:26:02 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-10 18:26:02 +0000 |
| commit | 180ec7113e358a7f8388e1436dc0670a11ba68df (patch) | |
| tree | fba74833a7e89d6c19160a0d7e02355c5215c8df /app/views/projects | |
| parent | 09c4d27ae48ceb181f86657043af2a129c17dabf (diff) | |
| parent | ebd8b7f60f41358df562625a4692f352b86b8c80 (diff) | |
| download | gitlab-ce-180ec7113e358a7f8388e1436dc0670a11ba68df.tar.gz | |
Merge branch 'bvl-security-patches' into 'master'
Security patches -> `master`
See merge request !11230
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/imports/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/git_access.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml index 2cd8d03e30e..25a87411cac 100644 --- a/app/views/projects/imports/new.html.haml +++ b/app/views/projects/imports/new.html.haml @@ -10,7 +10,7 @@ .panel-body %pre :preserve - #{sanitize_repo_path(@project, @project.import_error)} + #{h(sanitize_repo_path(@project, @project.import_error))} = form_for @project, url: namespace_project_import_path(@project.namespace, @project), method: :post, html: { class: 'form-horizontal' } do |f| = render "shared/import_form", f: f diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml index fb0efd85dcd..68862206248 100644 --- a/app/views/projects/wikis/git_access.html.haml +++ b/app/views/projects/wikis/git_access.html.haml @@ -28,7 +28,7 @@ %h3 Clone your wiki %pre.dark :preserve - git clone #{ content_tag(:span, default_url_to_repo(@project_wiki), class: 'clone')} + git clone #{ content_tag(:span, h(default_url_to_repo(@project_wiki)), class: 'clone')} cd #{h @project_wiki.path} %h3 Start Gollum and edit locally |