Show Google Code image attachments inline.
This commit is contained in:
parent
e8fb197da2
commit
06399b3261
3 changed files with 13 additions and 3 deletions
|
@ -314,8 +314,12 @@ module Gitlab
|
||||||
raw_attachments.map do |attachment|
|
raw_attachments.map do |attachment|
|
||||||
next if attachment["isDeleted"]
|
next if attachment["isDeleted"]
|
||||||
|
|
||||||
link = "https://storage.googleapis.com/google-code-attachments/#{@repo.name}/issue-#{issue_id}/comment-#{comment_id}/#{attachment["fileName"]}"
|
filename = attachment["fileName"]
|
||||||
"[#{attachment["fileName"]}](#{link})"
|
link = "https://storage.googleapis.com/google-code-attachments/#{@repo.name}/issue-#{issue_id}/comment-#{comment_id}/#{filename}"
|
||||||
|
|
||||||
|
text = "[#{filename}](#{link})"
|
||||||
|
text = "!#{text}" if filename =~ /\.(png|jpg|jpeg|gif|bmp|tiff)\z/
|
||||||
|
text
|
||||||
end.compact
|
end.compact
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
5
spec/fixtures/GoogleCodeProjectHosting.json
vendored
5
spec/fixtures/GoogleCodeProjectHosting.json
vendored
|
@ -372,6 +372,11 @@
|
||||||
"fileName" : "tint2_task_scrolling.diff",
|
"fileName" : "tint2_task_scrolling.diff",
|
||||||
"fileSize" : 3059,
|
"fileSize" : 3059,
|
||||||
"mimetype" : "text/x-c++; charset=us-ascii"
|
"mimetype" : "text/x-c++; charset=us-ascii"
|
||||||
|
}, {
|
||||||
|
"attachmentId" : "000",
|
||||||
|
"fileName" : "screenshot.png",
|
||||||
|
"fileSize" : 0,
|
||||||
|
"mimetype" : "image/png"
|
||||||
} ]
|
} ]
|
||||||
}, {
|
}, {
|
||||||
"id" : 1,
|
"id" : 1,
|
||||||
|
|
|
@ -49,7 +49,8 @@ describe Gitlab::GoogleCodeImport::Importer do
|
||||||
expect(issue.description).to include('Patch is attached that adds two new mouse\-actions \(next\_taskprev\_task\)')
|
expect(issue.description).to include('Patch is attached that adds two new mouse\-actions \(next\_taskprev\_task\)')
|
||||||
expect(issue.description).to include('that can be used for exactly that purpose.')
|
expect(issue.description).to include('that can be used for exactly that purpose.')
|
||||||
expect(issue.description).to include('all the best!')
|
expect(issue.description).to include('all the best!')
|
||||||
expect(issue.description).to include('https://storage.googleapis.com/google-code-attachments/tint2/issue-169/comment-0/tint2_task_scrolling.diff')
|
expect(issue.description).to include('[tint2_task_scrolling.diff](https://storage.googleapis.com/google-code-attachments/tint2/issue-169/comment-0/tint2_task_scrolling.diff)')
|
||||||
|
expect(issue.description).to include('![screenshot.png](https://storage.googleapis.com/google-code-attachments/tint2/issue-169/comment-0/screenshot.png)')
|
||||||
end
|
end
|
||||||
|
|
||||||
it "imports issue comments" do
|
it "imports issue comments" do
|
||||||
|
|
Loading…
Reference in a new issue