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
Jérome Perrin
gitlab-ce
Commits
a87fe2a4
Commit
a87fe2a4
authored
Feb 17, 2016
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes requested by Rémy
parent
016367c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
app/views/projects/blob/_image.html.haml
app/views/projects/blob/_image.html.haml
+4
-3
app/views/projects/diffs/_image.html.haml
app/views/projects/diffs/_image.html.haml
+1
-1
No files found.
app/views/projects/blob/_image.html.haml
View file @
a87fe2a4
.file-content.image_file
.file-content.image_file
-
if
blob_svg?
(
blob
)
-
if
blob_svg?
(
blob
)
-
# We need to scrub SVG but we cannot do so in the RawController
-
# We need to scrub SVG but we cannot do so in the RawController: it would
-
# be wrong/strange if RawController modified the data.
-
blob
.
load_all_data!
(
@repository
)
-
blob
.
load_all_data!
(
@repository
)
-
blob
=
sanitize_svg
(
blob
)
-
blob
=
sanitize_svg
(
blob
)
%img
{
src:
"data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"
}
%img
{
src:
"data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"
}
-
else
-
else
%img
{
src:
namespace_project_raw_path
(
@project
.
namespace
,
@project
,
@id
)}
%img
{
src:
namespace_project_raw_path
(
@project
.
namespace
,
@project
,
@id
)}
app/views/projects/diffs/_image.html.haml
View file @
a87fe2a4
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.image
.image
%span
.wrap
%span
.wrap
.frame
{
class:
image_diff_class
(
diff
)}
.frame
{
class:
image_diff_class
(
diff
)}
%img
{
src:
file_raw_path
}
%img
{
src:
diff
.
deleted_file
?
old_file_raw_path
:
file_raw_path
}
%p
.image-info
=
"
#{
number_to_human_size
file
.
size
}
"
%p
.image-info
=
"
#{
number_to_human_size
file
.
size
}
"
-
else
-
else
.image
.image
...
...
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