summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-2716-129/+636
* Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into 'ma...Kamil Trzciński2018-03-277-12/+26
|\
| * Re-arrange deployment_platform to avoid cop complainments5347-fix-multiple-clusters-incorrect-details-injectedMayra Cabrera2018-03-261-4/+10
| * Rearrange DeploymentPlatform methodsMayra Cabrera2018-03-227-9/+17
* | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-27104-230/+3867
|\ \
| * | remove some lintMicaël Bergeron2018-03-265-5/+1
| * | personal snippets will now comply with `background_upload`Micaël Bergeron2018-03-263-1/+12
| * | remove lintMicaël Bergeron2018-03-221-4/+5
| * | fix the api jobs spec from having EE specific testsMicaël Bergeron2018-03-221-23/+0
| * | fix the failing specsMicaël Bergeron2018-03-227-7/+11
| * | Backport EE changesMicaël Bergeron2018-03-222-0/+0
| * | remove EE-only codeMicaël Bergeron2018-03-222-74/+0
| * | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into 40781-o...Micaël Bergeron2018-03-221-1/+1
| |\ \
| | * | Fix pipeline serializer specSean McGivern2018-03-151-1/+1
| * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-221133-7137/+23384
| |\ \ \
| * | | | apply feedbackMicaël Bergeron2018-03-221-7/+0
| * | | | Fix http_io to make it return path is nilShinya Maeda2018-03-221-1/+1
| * | | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-2212-60/+147
| | |/ / | |/| |
| * | | fix an indentation problemMicaël Bergeron2018-03-121-1/+1
| * | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ce-4078...Micaël Bergeron2018-03-098-77/+17
| |\ \ \
| | * | | apply feedbackMicaël Bergeron2018-03-098-77/+17
| * | | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-0915-26/+180
| |/ / /
| * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-081369-19699/+47701
| |\ \ \
| * | | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-0816-11/+423
| * | | | Merge branch 'poc-upload-hashing-path' into 'master'Sean McGivern2018-03-086-47/+70
| * | | | fix specsMicaël Bergeron2018-03-073-24/+0
| * | | | [ci-skip] add the CE changelog and remove the EE changelogsMicaël Bergeron2018-03-0711-51/+5
| * | | | fix yet other specsMicaël Bergeron2018-03-073-22/+30
| * | | | fix some broken specsMicaël Bergeron2018-03-068-43/+31
| * | | | fixing some broken mergesMicaël Bergeron2018-03-026-39/+5
| * | | | another round of EE code removalMicaël Bergeron2018-03-028-269/+75
| * | | | remove geo specific codeMicaël Bergeron2018-03-0116-1493/+76
| * | | | removed EE specific code from the portMicaël Bergeron2018-03-0115-948/+0
| * | | | remove the license checkMicaël Bergeron2018-03-012-76/+0
| * | | | Merge branch 'fix/sm/atomic-migration' into 'master'Micaël Bergeron2018-03-013-28/+162
| * | | | rework the migration to use the EE onesMicaël Bergeron2018-03-015-38/+54
| * | | | add the Ci::Build `*_store` columnMicaël Bergeron2018-03-013-21/+27
| * | | | fix the prepare_untracked_uploads_spec from using the EE schemaMicaël Bergeron2018-03-013-1/+3
| * | | | remove the license checkMicaël Bergeron2018-03-014-79/+1
| * | | | fix the EE migrationsMicaël Bergeron2018-03-015-62/+38
| * | | | another round of fixesMicaël Bergeron2018-03-0110-56/+360
| * | | | port the object storage to CEMicaël Bergeron2018-03-0124-58/+951
| * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-281664-27061/+40313
| |\ \ \ \
| * | | | | Merge branch 'fix/sm/atomic-migration' into 'master'Kamil Trzciński2018-02-287-30/+180
| * | | | | Merge branch '4915-background-upload-option-is-not-effective' into 'master'Kamil Trzciński2018-02-282-9/+14
| * | | | | Merge branch '4879-support-private-https-urls-for-object-storage' into 'master'Sean McGivern2018-02-282-0/+44
| * | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-28797-4606/+15755
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-281975-22286/+38401
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-2874-914/+822
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-2837-63/+2295