Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'make-job-lfs-artifacts-read-only' into 'master' | Douwe Maan | 2018-05-02 | 1 | -9/+3 |
| | | | | | Fix file_store for artifacts and lfs when saving See merge request gitlab-org/gitlab-ce!18624 | ||||
* | Merge branch 'fix-direct-upload-for-old-records' into 'master' | Grzegorz Bizon | 2018-04-20 | 1 | -31/+70 |
| | | | | | | Fix direct_upload for old records See merge request gitlab-org/gitlab-ce!18360 | ||||
* | Add `direct_upload` setting for artifactsdirect-upload-of-artifacts | Kamil Trzciński | 2018-04-05 | 1 | -109/+46 |
| | |||||
* | Allow to store uploads by default on Object Storagedirect-upload-of-uploads | Kamil Trzciński | 2018-04-04 | 1 | -4/+34 |
| | | | | Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data | ||||
* | backport missing object storage worker specsbackport-os-worker-specs | Micaël Bergeron | 2018-04-02 | 2 | -0/+265 |
| | |||||
* | Add Gitlab::ExclusiveLease to ObjectStorage#use_file | Alessio Caiazza | 2018-03-29 | 1 | -0/+24 |
| | |||||
* | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce | Alessio Caiazza | 2018-03-27 | 2 | -26/+330 |
| | |||||
* | remove some lint | Micaël Bergeron | 2018-03-26 | 4 | -4/+0 |
| | |||||
* | personal snippets will now comply with `background_upload` | Micaël Bergeron | 2018-03-26 | 1 | -0/+6 |
| | |||||
* | Merge branch 'poc-upload-hashing-path' into 'master' | Sean McGivern | 2018-03-08 | 1 | -20/+18 |
| | | | | | | | File uploads on objects storage should use hashed storage Closes #4952 See merge request gitlab-org/gitlab-ee!4597 | ||||
* | fixing some broken merges | Micaël Bergeron | 2018-03-02 | 1 | -26/+0 |
| | |||||
* | another round of EE code removal | Micaël Bergeron | 2018-03-02 | 1 | -0/+11 |
| | |||||
* | remove the license check | Micaël Bergeron | 2018-03-01 | 1 | -51/+0 |
| | |||||
* | remove the license check | Micaël Bergeron | 2018-03-01 | 1 | -22/+0 |
| | |||||
* | port the object storage to CE | Micaël Bergeron | 2018-03-01 | 2 | -4/+47 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 1 | -3/+3 |
|\ | | | | | | | object-storage-ee-to-ce-backport | ||||
| * | Use hashed storage in the specs40744-hashed-storage-specs | Nick Thomas | 2018-02-07 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'fix/sm/atomic-migration' into 'master' | Kamil Trzciński | 2018-02-28 | 2 | -0/+37 |
| | | | | | | | | | | | | | | | | Fix migrate! method (Minimal fix with ExclusiveLock to prevent race conditions) Closes #4928 and #4980 See merge request gitlab-org/gitlab-ee!4624 | ||||
* | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵ | Kamil Trzciński | 2018-02-28 | 2 | -2/+25 |
|\ \ | |/ | | | | | object-storage-ee-to-ce-backport | ||||
| * | Merge branch '14256-upload-destroy-removes-file' into 'master' | Sean McGivern | 2018-02-06 | 1 | -0/+23 |
| |\ | | | | | | | | | | | | | | | | | | | Uploads should delete files when destroyed Closes #14256 See merge request gitlab-org/gitlab-ce!16799 | ||||
| | * | improvements from feedback14256-upload-destroy-removes-file | Micaël Bergeron | 2018-02-06 | 1 | -1/+1 |
| | | | |||||
| | * | remove file after `Upload#destroy` | Micaël Bergeron | 2018-02-06 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | it will also automatically prune empty directories for `FileUploader`-based uploaders. | ||||
| * | | Fix tests for Drop filename enforcement | Shinya Maeda | 2018-02-06 | 1 | -16/+0 |
| | | | |||||
| * | | Add essential tests | Shinya Maeda | 2018-02-06 | 1 | -0/+43 |
| |/ | |||||
| * | apply fixes from feedback42547-upload-store-mount-point | Micaël Bergeron | 2018-02-02 | 1 | -0/+27 |
| | | |||||
| * | add the uploader context to the upload model | Micaël Bergeron | 2018-02-02 | 2 | -2/+2 |
| | | |||||
* | | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 10 | -134/+294 |
| |/ | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8. | ||||
| * | porting changes from upstream3867-port-to-ce | Micaël Bergeron | 2018-02-01 | 1 | -12/+0 |
| | | |||||
| * | port of 594e6a0a625^..f74c90f68c6 | Micaël Bergeron | 2018-02-01 | 10 | -282/+134 |
| | | |||||
| * | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 2 | -2/+2 |
| | | |||||
| * | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' | Nick Thomas | 2018-01-24 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | EE: Trace as artifacts (FileStorage and ObjectStorage) Closes #4171 See merge request gitlab-org/gitlab-ee!4258 | ||||
* | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 12 | -595/+596 |
| | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867 | ||||
* | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵ | Kamil Trzciński | 2018-02-28 | 1 | -1/+1 |
|\ \ | |/ | | | | | object-storage-ee-to-ce-backport | ||||
| * | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_rails | Rémy Coutable | 2017-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'zj-auto-upload-job-artifacts' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | Transfer job archives after creation See merge request gitlab-org/gitlab-ee!3646 | ||||
* | | Merge branch 'zj-multiple-artifacts-ee' into 'master' | Grzegorz Bizon | 2018-02-28 | 3 | -13/+103 |
| | | | | | | | | | | | | Multiple artifacts ee See merge request gitlab-org/gitlab-ee!3276 | ||||
* | | Merge branch 'jej/object-storage-uploader-migrate-with-license-callback' ↵ | Kamil Trzciński | 2018-02-28 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | into 'master' ObjectStoreUploader#migrate! uses with_callbacks to trigger verify_license! Closes #3370 See merge request !2863 | ||||
* | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵ | Kamil Trzciński | 2018-02-28 | 4 | -32/+131 |
|\ \ | |/ | | | | | object-storage-ee-to-ce-backport | ||||
| * | Support uploads for groups | Jarka Kadlecova | 2017-12-07 | 1 | -0/+21 |
| | | |||||
| * | Fix rubocop | Kamil Trzcinski | 2017-12-03 | 2 | -6/+6 |
| | | |||||
| * | Sync ArtifactUploader specs with EE | Kamil Trzcinski | 2017-12-03 | 2 | -24/+26 |
| | | |||||
| * | Fix specs failures, and use factory with `:ci_job_artifact, :archive` | Kamil Trzcinski | 2017-12-03 | 2 | -5/+55 |
| | | |||||
| * | Rename artifacts_* to legacy_artifacts_* | Kamil Trzcinski | 2017-12-03 | 1 | -1/+1 |
| | | |||||
| * | Fix legacy migration test | Zeger-Jan van de Weg | 2017-12-03 | 1 | -1/+1 |
| | | |||||
| * | Rename Artifact to JobArtifact, split metadata out | Zeger-Jan van de Weg | 2017-12-03 | 2 | -2/+17 |
| | | | | | | | | | | | | | | | | | | Two things at ones, as there was no clean way to seperate the commit and give me feedback from the tests. But the model Artifact is now JobArtifact, and the table does not have a type anymore, but the metadata is now its own model: Ci::JobArtifactMetadata. | ||||
| * | FileUploader should check for hashed_storage?(:attachments) to use disk_path | Gabriel Mazetto | 2017-11-21 | 1 | -12/+38 |
| | | |||||
* | | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵ | Kamil Trzciński | 2018-02-28 | 1 | -13/+39 |
|\ \ | |/ | | | | | object-storage-ee-to-ce-backport | ||||
| * | Use the Hashed Storage compatible layer to store Attachments | Gabriel Mazetto | 2017-10-30 | 1 | -13/+39 |
| | |