summaryrefslogtreecommitdiff
path: root/app/uploaders/file_uploader.rb
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-05-01 15:14:35 +0200
committerJarka Kadlecova <jarka@gitlab.com>2017-05-02 15:22:24 +0200
commit43ff7386411af0f538710f3627622f71e5e34472 (patch)
tree3bb4d32c1389504d70395f36e8e223899fcbccd5 /app/uploaders/file_uploader.rb
parent6277bda61c511696f9d12fae4238b5214a722571 (diff)
downloadgitlab-ce-43ff7386411af0f538710f3627622f71e5e34472.tar.gz
Support uploaders for personal snippets comments12910-uploader-pers-snippet
Diffstat (limited to 'app/uploaders/file_uploader.rb')
-rw-r--r--app/uploaders/file_uploader.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index d2783ce5b2f..7e94218c23d 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -26,11 +26,11 @@ class FileUploader < GitlabUploader
File.join(CarrierWave.root, base_dir, model.path_with_namespace)
end
- attr_accessor :project
+ attr_accessor :model
attr_reader :secret
- def initialize(project, secret = nil)
- @project = project
+ def initialize(model, secret = nil)
+ @model = model
@secret = secret || generate_secret
end
@@ -38,10 +38,6 @@ class FileUploader < GitlabUploader
File.join(dynamic_path_segment, @secret)
end
- def model
- project
- end
-
def relative_path
self.file.path.sub("#{dynamic_path_segment}/", '')
end