diff options
author | Robert Speicher <robert@gitlab.com> | 2016-01-08 23:29:43 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-01-08 23:29:43 +0300 |
commit | af68897acda31a55093e2b5fdd7eba61e54b404c (patch) | |
tree | de423ec8ff971b5f2c42cb6810259d2fab82da67 /lib | |
parent | 6467448a1aaaa216560d35f2bd0ac4f8932f77ec (diff) | |
parent | 0614793b38db4711053cbcb4fa80d9c8cc492eec (diff) |
Merge branch 'api-project-upload' into 'master'
Add API project upload endpoint
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317
See merge request !2329
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/projects.rb | 12 | ||||
-rw-r--r-- | lib/gitlab/email/receiver.rb | 7 | ||||
-rw-r--r-- | lib/gitlab/fogbugz_import/importer.rb | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 0781236cf6d..8b1390e3289 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -269,7 +269,7 @@ module API # Remove a forked_from relationship # # Parameters: - # id: (required) - The ID of the project being marked as a fork + # id: (required) - The ID of the project being marked as a fork # Example Request: # DELETE /projects/:id/fork delete ":id/fork" do @@ -278,6 +278,16 @@ module API user_project.forked_project_link.destroy end end + + # Upload a file + # + # Parameters: + # id: (required) - The ID of the project + # file: (required) - The file to be uploaded + post ":id/uploads" do + ::Projects::UploadService.new(user_project, params[:file]).execute + end + # search for projects current_user has access to # # Parameters: diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb index 2b252b32887..2ca21af5bc8 100644 --- a/lib/gitlab/email/receiver.rb +++ b/lib/gitlab/email/receiver.rb @@ -74,7 +74,7 @@ module Gitlab def sent_notification return nil unless reply_key - + SentNotification.for(reply_key) end @@ -82,10 +82,7 @@ module Gitlab attachments = Email::AttachmentUploader.new(message).execute(sent_notification.project) attachments.each do |link| - text = "[#{link[:alt]}](#{link[:url]})" - text.prepend("!") if link[:is_image] - - reply << "\n\n#{text}" + reply << "\n\n#{link[:markdown]}" end reply diff --git a/lib/gitlab/fogbugz_import/importer.rb b/lib/gitlab/fogbugz_import/importer.rb index 403ebeec474..db580b5e578 100644 --- a/lib/gitlab/fogbugz_import/importer.rb +++ b/lib/gitlab/fogbugz_import/importer.rb @@ -232,9 +232,7 @@ module Gitlab return nil if res.nil? - text = "[#{res['alt']}](#{res['url']})" - text = "!#{text}" if res['is_image'] - text + res[:markdown] end def build_attachment_url(rel_url) |