diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-05 17:31:33 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 22:44:09 +0300 |
| commit | 6ca02a41500790b3e9061dd8836540955b9aaf7c (patch) | |
| tree | 5c66c4826cafa2657fe25d85eb9e189b5f290f32 /app/uploaders/job_artifact_uploader.rb | |
| parent | ec72abf53fd82ca3e7f126536a83b27b368696ec (diff) | |
Merge branch 'zj-multiple-artifacts-ee' into 'master'
Multiple artifacts ee
See merge request gitlab-org/gitlab-ee!3276
Diffstat (limited to 'app/uploaders/job_artifact_uploader.rb')
| -rw-r--r-- | app/uploaders/job_artifact_uploader.rb | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb index 15dfb5a5763..a0757dbe6b2 100644 --- a/app/uploaders/job_artifact_uploader.rb +++ b/app/uploaders/job_artifact_uploader.rb @@ -1,5 +1,5 @@ -class JobArtifactUploader < GitlabUploader - storage :file +class JobArtifactUploader < ObjectStoreUploader + storage_options Gitlab.config.artifacts def self.local_store_path Gitlab.config.artifacts.path @@ -15,24 +15,8 @@ class JobArtifactUploader < GitlabUploader model.size end - def store_dir - default_local_path - end - - def cache_dir - File.join(self.class.local_store_path, 'tmp/cache') - end - - def work_dir - File.join(self.class.local_store_path, 'tmp/work') - end - private - def default_local_path - File.join(self.class.local_store_path, default_path) - end - def default_path creation_date = model.created_at.utc.strftime('%Y_%m_%d') |