summaryrefslogtreecommitdiff
path: root/app/controllers/uploads_controller.rb
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-05-29 09:54:35 +0200
committerJarka Kadlecova <jarka@gitlab.com>2017-06-07 07:52:41 +0200
commit2e311d9d1aac58bbd9c7d6c97c7cbcccf2715347 (patch)
tree04555ee940d5488ef6d44c5ad3afa0688cd6c1c5 /app/controllers/uploads_controller.rb
parent4464c22d6d23d893494682d309aec3fb31c11ae3 (diff)
downloadgitlab-ce-12910-snippets-description.tar.gz
Support uploads for newly created personal snippets12910-snippets-description
Diffstat (limited to 'app/controllers/uploads_controller.rb')
-rw-r--r--app/controllers/uploads_controller.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 5cb3de3d4f5..dc882b17143 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -17,6 +17,8 @@ class UploadsController < ApplicationController
end
def authorize_access!
+ return nil unless model
+
authorized =
case model
when Note
@@ -35,7 +37,7 @@ class UploadsController < ApplicationController
end
def authorize_create_access!
- return unless model
+ return nil unless model
# for now we support only personal snippets comments
authorized = can?(current_user, :comment_personal_snippet, model)
@@ -77,7 +79,12 @@ class UploadsController < ApplicationController
def uploader
return @uploader if defined?(@uploader)
- if model.is_a?(PersonalSnippet)
+ case model
+ when nil
+ @uploader = PersonalFileUploader.new(nil, params[:secret])
+
+ @uploader.retrieve_from_store!(params[:filename])
+ when PersonalSnippet
@uploader = PersonalFileUploader.new(model, params[:secret])
@uploader.retrieve_from_store!(params[:filename])