BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
678a39d5
Commit
678a39d5
authored
Apr 26, 2017
by
Brian Neel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for hamlit filter XSS in project import
parent
47dee0f5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
create.js.haml
app/views/import/base/create.js.haml
+1
-1
new.html.haml
app/views/projects/imports/new.html.haml
+1
-1
git_access.html.haml
app/views/projects/wikis/git_access.html.haml
+1
-1
No files found.
app/views/import/base/create.js.haml
View file @
678a39d5
...
...
@@ -10,4 +10,4 @@
-
else
:plain
job = $("tr#repo_
#{
@repo_id
}
")
job.find(".import-actions").html("<i class='fa fa-exclamation-circle'></i> Error saving project:
#{
escape_javascript
(
@project
.
errors
.
full_messages
.
join
(
','
))
}
")
job.find(".import-actions").html("<i class='fa fa-exclamation-circle'></i> Error saving project:
#{
escape_javascript
(
h
(
@project
.
errors
.
full_messages
.
join
(
','
)
))
}
")
app/views/projects/imports/new.html.haml
View file @
678a39d5
...
...
@@ -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
...
...
app/views/projects/wikis/git_access.html.haml
View file @
678a39d5
...
...
@@ -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
...
...
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