Commit graph

7 commits

Author SHA1 Message Date
Micaël Bergeron
764b5fdd16 Backport EE changes 2018-03-22 13:35:42 -04: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
Grzegorz Bizon
6ca02a4150 Merge branch 'zj-multiple-artifacts-ee' into 'master'
Multiple artifacts ee

See merge request gitlab-org/gitlab-ee!3276
2018-02-28 20:44:09 +01:00
Kamil Trzciński
2b7b607284 Merge branch 'zj-fix-resolver-issue' into 'master'
Switch out resolver to mitigate SocketError

See merge request !2809
2018-02-28 20:34:13 +01:00
Kamil Trzciński
d7448f161f Merge branch 'zj-improve-object-store-rake-task' into 'master'
Use proper logging for artifacts rake task

See merge request !2762
2018-02-28 20:34:03 +01:00
Douwe Maan
bc76062774 Merge branch 'jej/lfs-object-storage' into 'master'
Can migrate LFS objects to S3 style object storage

Closes #2841

See merge request !2760
2018-02-28 20:29:37 +01:00
Grzegorz Bizon
52c3b8f312 Merge branch 'zj-object-store-artifacts' into 'master'
Object store for artifacts

Closes gitlab-ce#29203

See merge request !1762
2018-02-28 20:00:27 +01:00