Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 1 deletions

diff --git a/lib/api/entities/project_upload.rb b/lib/api/entities/project_upload.rb
new file mode 100644
index 00000000000..f38f8d74f7b
--- /dev/null
+++ b/lib/api/entities/project_upload.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class ProjectUpload < Grape::Entity
+      include Gitlab::Routing
+
+      expose :markdown_name, as: :alt
+      expose :secure_url, as: :url
+      expose :full_path do |uploader|
+        show_project_uploads_path(
+          uploader.model,
+          uploader.secret,
+          uploader.filename
+        )
+      end
+
+      expose :markdown_link, as: :markdown
+    end
+  end
+end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 6f96ffde0a7..43d607bc0c1 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -494,7 +494,9 @@ module API
         requires :file, type: File, desc: 'The file to be uploaded' # rubocop:disable Scalability/FileUploads
       end
       post ":id/uploads" do
-        UploadService.new(user_project, params[:file]).execute.to_h
+        upload = UploadService.new(user_project, params[:file]).execute
+
+        present upload, with: Entities::ProjectUpload
       end
 
       desc 'Get the users list of a project' do