Commit graph

21 commits

Author SHA1 Message Date
Kamil Trzciński
a2f375e8f7 Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-backport 2018-02-28 21:28:43 +01:00
Kamil Trzciński
79a5e7fb53 Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-ee-to-ce-backport 2018-02-28 21:14:25 +01:00
Sean McGivern
a7dae52e9d Merge branch '4163-move-uploads-to-object-storage' into 'master'
Move uploads to object storage

Closes #4163

See merge request gitlab-org/gitlab-ee!3867
2018-02-28 20:58:15 +01:00
Sean McGivern
028562a049 Fix 500 error when loading an invalid upload URL 2018-02-22 14:32:01 +00:00
Micaël Bergeron
74ddc80590 add the uploader context to the upload model 2018-02-02 09:28:15 -05:00
Micaël Bergeron
a5bb17ffd5 porting changes from upstream 2018-02-01 15:08:35 -05:00
Micaël Bergeron
c614089d65 porting upstream changes 2018-02-01 12:14:46 -05:00
Micaël Bergeron
2057a6acde port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
Kamil Trzcinski
263717d70c Do not perform hard check (presence of file on storage)
Instead perform soft check (the column set to indicate that file does exist)
2017-09-19 16:41:28 +02:00
Bob Van Landuyt
27a6aa4f51 Move system-uploads to -/system 2017-07-18 15:38:11 +02:00
Kamil Trzcinski
05683f313b Fix filename method of GitlabUploader to return always real filename 2017-06-13 00:37:12 +02:00
Kamil Trzciński
de6c116530 Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'
Set artifact working directory to be in the destination store to prevent unnecessary I/O

Closes #33274

See merge request !11905
2017-06-12 19:31:00 +00:00
Bob Van Landuyt
2e97db887c Make the uploader use the updated folder 2017-06-08 16:17:13 +02:00
DJ Mountney
565ead6102 Bring in security changes from the 9.2.5 release
Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue
2017-06-08 16:17:13 +02:00
Stan Hu
8a417f5ae8 Set artifact working directory to be in the destination store to prevent unnecessary I/O
Similar to #33218, build artifacts were being uploaded into a CarrierWave
temporary directory in the Rails root directory before moved to their
final destination, which could cause a copy across filesystems. This
merge request refactors the work in !11866 so that any uploader can
just override `work_dir` to change the default implementation.

Closes #33274
2017-06-06 09:51:28 -07:00
Kamil Trzcinski
6185d12c18 Add missing specs 2017-06-01 16:34:48 +02:00
Kamil Trzcinski
e61f38d79e Fix data inconsistency issue for old artifacts by moving them to a currently used path 2017-06-01 14:39:48 +02:00
Jarka Kadlecova
43ff738641 Support uploaders for personal snippets comments 2017-05-02 15:22:24 +02:00
Robert Speicher
5c41338fa3 Handle relative and absolute Upload paths in the Uploaders 2017-03-06 14:41:10 -05:00
Robert Speicher
a8c62dfe5c Minor refactoring of Uploaders
- Moves a duplicate `file_storage?` definition into the common
  `GitlabUploader` ancestor.
- Get the `uploads` base directory from a class method rather than
  hard-coding it where it's needed. This will be used in a subsequent MR
  to store Uploads in the database.
- Improves the specs for uploaders.
2017-02-24 16:41:27 -05:00
Jacob Vosmaer
6731ab5d76 Add Gitlab::Middleware::Multipart 2016-12-15 12:26:36 +01:00