summaryrefslogtreecommitdiff
path: root/app/services/projects
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-07 13:37:14 +0100
committerDouwe Maan <douwe@gitlab.com>2016-01-07 13:37:14 +0100
commit1886d727f738895bb552151d59d4024f405522e2 (patch)
tree684b1abde7d7951456a8bb0956867a953971f5eb /app/services/projects
parent09216e8bbdd82e46705888aba13405a2fd191100 (diff)
downloadgitlab-ce-1886d727f738895bb552151d59d4024f405522e2.tar.gz
Add API project upload endpoint
Diffstat (limited to 'app/services/projects')
-rw-r--r--app/services/projects/download_service.rb7
-rw-r--r--app/services/projects/upload_service.rb7
2 files changed, 12 insertions, 2 deletions
diff --git a/app/services/projects/download_service.rb b/app/services/projects/download_service.rb
index 99f22293d0d..b846a59ed94 100644
--- a/app/services/projects/download_service.rb
+++ b/app/services/projects/download_service.rb
@@ -18,10 +18,15 @@ module Projects
filename = uploader.image? ? uploader.file.basename : uploader.file.filename
+ escaped_filename = filename.gsub("]", "\\]")
+ markdown = "[#{escaped_filename}](#{uploader.secure_url})"
+ markdown.prepend("!") if uploader.image?
+
{
'alt' => filename,
'url' => uploader.secure_url,
- 'is_image' => uploader.image?
+ 'is_image' => uploader.image?,
+ 'markdown' => markdown
}
end
diff --git a/app/services/projects/upload_service.rb b/app/services/projects/upload_service.rb
index 279550d6f4a..36ccf1cda12 100644
--- a/app/services/projects/upload_service.rb
+++ b/app/services/projects/upload_service.rb
@@ -12,10 +12,15 @@ module Projects
filename = uploader.image? ? uploader.file.basename : uploader.file.filename
+ escaped_filename = filename.gsub("]", "\\]")
+ markdown = "[#{escaped_filename}](#{uploader.secure_url})"
+ markdown.prepend("!") if uploader.image?
+
{
alt: filename,
url: uploader.secure_url,
- is_image: uploader.image?
+ is_image: uploader.image?,
+ markdown: markdown
}
end