Commits · 2387ef2b4a9944749f0cd1db5c7e7f55f3745780 · Jérome Perrin / gitlab-ce

08 Mar, 2018 1 commit

Merge branch 'poc-upload-hashing-path' into 'master' · 2387ef2b

Sean McGivern authored Mar 02, 2018

File uploads on objects storage should use hashed storage

Closes #4952

See merge request gitlab-org/gitlab-ee!4597

2387ef2b

07 Mar, 2018 3 commits
- fix specs · 960b6337
  Micaël Bergeron authored Mar 07, 2018
  
  960b6337
- [ci-skip] add the CE changelog and remove the EE changelogs · a46fde67
  Micaël Bergeron authored Mar 07, 2018
  
  a46fde67
- fix yet other specs · 2bf29a0c
  Micaël Bergeron authored Mar 07, 2018
  
  2bf29a0c
06 Mar, 2018 1 commit
- fix some broken specs · a8594886
  Micaël Bergeron authored Mar 06, 2018
  
  a8594886
02 Mar, 2018 2 commits
- fixing some broken merges · b03b3165
  Micaël Bergeron authored Mar 02, 2018
  
  b03b3165
- another round of EE code removal · 4484587e
  Micaël Bergeron authored Mar 02, 2018
  
  4484587e
01 Mar, 2018 11 commits
- remove geo specific code · 0d458b96
  Micaël Bergeron authored Mar 01, 2018
  
  0d458b96
- removed EE specific code from the port · 0e732fa4
  Micaël Bergeron authored Mar 01, 2018
  
  0e732fa4
- remove the license check · 50893887
  Micaël Bergeron authored Feb 28, 2018
  
  50893887
- Merge branch 'fix/sm/atomic-migration' into 'master' · d59210de
  Micaël Bergeron authored Feb 28, 2018
```
Fix migrate! method (Minimal fix with ExclusiveLock to prevent race conditions)

Closes #4928 and #4980

See merge request gitlab-org/gitlab-ee!4624
```
  d59210de
- rework the migration to use the EE ones · a3e46d9b
  Micaël Bergeron authored Feb 27, 2018
  
  a3e46d9b
- add the Ci::Build `*_store` column · 40a3b467
  Micaël Bergeron authored Feb 26, 2018
  
  40a3b467
- fix the prepare_untracked_uploads_spec from using the EE schema · e43d7d2b
  Micaël Bergeron authored Feb 22, 2018
  
  e43d7d2b
- remove the license check · 5cf1cc6a
  Micaël Bergeron authored Feb 22, 2018
  
  5cf1cc6a
- fix the EE migrations · 50c08d0e
  Micaël Bergeron authored Feb 22, 2018
  
  50c08d0e
- another round of fixes · a8df653f
  Micaël Bergeron authored Feb 21, 2018
  
  a8df653f
- port the object storage to CE · 0f1d348d
  Micaël Bergeron authored Feb 21, 2018
  
  0f1d348d
28 Feb, 2018 22 commits
- Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-backport · a2f375e8
  Kamil Trzciński authored Feb 28, 2018
  
  a2f375e8
- Merge branch 'fix/sm/atomic-migration' into 'master' · a22f6fa6
  Kamil Trzciński authored Feb 27, 2018
```
Fix migrate! method (Minimal fix with ExclusiveLock to prevent race conditions)

Closes #4928 and #4980

See merge request gitlab-org/gitlab-ee!4624
```
  a22f6fa6
- Merge branch '4915-background-upload-option-is-not-effective' into 'master' · b4dc556c
  Kamil Trzciński authored Feb 13, 2018
```
Resolve "Background upload option is not effective"

Closes #4915

See merge request gitlab-org/gitlab-ee!4507
```
  b4dc556c
- Merge branch '4879-support-private-https-urls-for-object-storage' into 'master' · d4a28275
  Sean McGivern authored Feb 14, 2018
```
Resolve ""Support private HTTPS urls for object storage""

Closes #4879

See merge request gitlab-org/gitlab-ee!4475
```
  d4a28275
- Merge commit '7e424eb8 ' into object-storage-ee-to-ce-backport · 79a5e7fb
  Kamil Trzciński authored Feb 28, 2018
  
  79a5e7fb
- Merge commit '8af23def ' into object-storage-ee-to-ce-backport · 729391fb
  Kamil Trzciński authored Feb 28, 2018
  
  729391fb
- Revert "Merge branch '3867-port-to-ce' into 'master'" · 8af23def
  Kamil Trzciński authored Feb 28, 2018
```
This reverts commit 54a575f1, reversing
changes made to c63af942.
```
  8af23def
- Merge branch 'feature/sm/artifacts-trace-ee' into 'master' · 999118f0
  Kamil Trzciński authored Feb 06, 2018
```
EE: Trace as artifacts (FileStorage and ObjectStorage)

Closes #4171

See merge request gitlab-org/gitlab-ee!4258
```
  999118f0
- Merge branch 'use-send-url-for-incompatible-runners' into 'master' · b14c484b
  Grzegorz Bizon authored Feb 06, 2018
```
Support SendURL for performing indirect download of artifacts if clients does…

See merge request gitlab-org/gitlab-ee!4401
```
  b14c484b
- Merge branch '4163-move-uploads-to-object-storage' into 'master' · a7dae52e
  Sean McGivern authored Feb 02, 2018
```
Move uploads to object storage

Closes #4163

See merge request gitlab-org/gitlab-ee!3867
```
  a7dae52e
- Merge commit '4b92efd9 ' into object-storage-ee-to-ce-backport · 45d2c316
  Kamil Trzciński authored Feb 28, 2018
  
  45d2c316
- Merge branch 'zj-auto-upload-job-artifacts' into 'master' · 87f11d2c
  Kamil Trzciński authored Dec 08, 2017
```
Transfer job archives after creation

See merge request gitlab-org/gitlab-ee!3646
```
  87f11d2c
- Merge branch 'zj-multiple-artifacts-ee' into 'master' · 6ca02a41
  Grzegorz Bizon authored Dec 05, 2017
```
Multiple artifacts ee

See merge request gitlab-org/gitlab-ee!3276
```
  6ca02a41
- Merge branch 'jej/object-storage-uploader-migrate-with-license-callback' into 'master' · ec72abf5
  Kamil Trzciński authored Sep 12, 2017
```
ObjectStoreUploader#migrate! uses with_callbacks to trigger verify_license!

Closes #3370

See merge request !2863
```
  ec72abf5
- Merge commit '7fabc892 ' into object-storage-ee-to-ce-backport · 965dc286
  Kamil Trzciński authored Feb 28, 2018
  
  965dc286
- Merge commit 'f2f58a60 ' into object-storage-ee-to-ce-backport · e3fafa76
  Kamil Trzciński authored Feb 28, 2018
  
  e3fafa76
- Merge commit '11c67e7c ' into object-storage-ee-to-ce-backport · e0401df1
  Kamil Trzciński authored Feb 28, 2018
  
  e0401df1
- Merge branch 'zj-fix-resolver-issue' into 'master' · 2b7b6072
  Kamil Trzciński authored Sep 04, 2017
```
Switch out resolver to mitigate SocketError

See merge request !2809
```
  2b7b6072
- Merge branch 'zj-improve-object-store-rake-task' into 'master' · d7448f16
  Kamil Trzciński authored Aug 25, 2017
```
Use proper logging for artifacts rake task

See merge request !2762
```
  d7448f16
- Merge branch 'jej/lfs-object-storage' into 'master' · bc760627
  Douwe Maan authored Sep 07, 2017
```
Can migrate LFS objects to S3 style object storage

Closes #2841

See merge request !2760
```
  bc760627
- Merge commit 'b39d0c31 ' into object-storage-ee-to-ce-backport · 5a69b51b
  Kamil Trzciński authored Feb 28, 2018
  
  5a69b51b
- Merge commit '5b08d59f ' into object-storage-ee-to-ce-backport · b1f8d8a1
  Kamil Trzciński authored Feb 28, 2018
  
  b1f8d8a1