Commit Graph

5 Commits

Author SHA1 Message Date
Micaël Bergeron b03b31659b fixing some broken merges 2018-03-02 16:19:17 -05:00
Micaël Bergeron 0d458b96e8 remove geo specific code 2018-03-01 16:30:31 -05:00
Kamil Trzciński 87f11d2cf5 Merge branch 'zj-auto-upload-job-artifacts' into 'master'
Transfer job archives after creation

See merge request gitlab-org/gitlab-ee!3646
2018-02-28 20:45:07 +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
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