summaryrefslogtreecommitdiff
path: root/app/uploaders/personal_file_uploader.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-06-27 10:53:06 +0000
committerMike Greiling <mike@pixelcog.com>2017-07-19 22:28:27 -0500
commit88df076fae9568314473de5fa6a0086c33663869 (patch)
treec550f1809aa781e94304ca467388c487945cc302 /app/uploaders/personal_file_uploader.rb
parent3a7b724f6a03a19719b05b30e1e76e536230bcca (diff)
downloadgitlab-ce-88df076fae9568314473de5fa6a0086c33663869.tar.gz
Merge branch '33359-pers-snippet-files-location' into 'security-9-3'
Use uploads/system directory for personal snippets See merge request !2123
Diffstat (limited to 'app/uploaders/personal_file_uploader.rb')
-rw-r--r--app/uploaders/personal_file_uploader.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/uploaders/personal_file_uploader.rb b/app/uploaders/personal_file_uploader.rb
index 7f857765fbf..ef70871624b 100644
--- a/app/uploaders/personal_file_uploader.rb
+++ b/app/uploaders/personal_file_uploader.rb
@@ -3,6 +3,10 @@ class PersonalFileUploader < FileUploader
File.join(CarrierWave.root, model_path(model))
end
+ def self.base_dir
+ File.join(root_dir, 'system')
+ end
+
private
def secure_url