summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-2741-86/+2065
|\
| * remove some lintMicaël Bergeron2018-03-265-5/+1
| * personal snippets will now comply with `background_upload`Micaël Bergeron2018-03-261-0/+6
| * 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-223-3/+6
| * Backport EE changesMicaël Bergeron2018-03-221-0/+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-22248-715/+8150
| |\ \
| * | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-224-29/+52
| | |/ | |/|
| * | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-091-0/+87
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-08403-8091/+10263
| |\ \
| * | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-087-1/+223
| * | | Merge branch 'poc-upload-hashing-path' into 'master'Sean McGivern2018-03-081-20/+18
| * | | fix specsMicaël Bergeron2018-03-073-24/+0
| * | | fix yet other specsMicaël Bergeron2018-03-073-22/+30
| * | | fix some broken specsMicaël Bergeron2018-03-065-40/+27
| * | | fixing some broken mergesMicaël Bergeron2018-03-022-27/+1
| * | | another round of EE code removalMicaël Bergeron2018-03-026-261/+68
| * | | remove geo specific codeMicaël Bergeron2018-03-0112-1482/+50
| * | | removed EE specific code from the portMicaël Bergeron2018-03-011-0/+0
| * | | remove the license checkMicaël Bergeron2018-03-012-76/+0
| * | | Merge branch 'fix/sm/atomic-migration' into 'master'Micaël Bergeron2018-03-012-1/+111
| * | | remove the license checkMicaël Bergeron2018-03-013-67/+1
| * | | another round of fixesMicaël Bergeron2018-03-012-49/+28
| * | | port the object storage to CEMicaël Bergeron2018-03-015-9/+98
| * | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-28382-2866/+8680
| |\ \ \
| * | | | Merge branch 'fix/sm/atomic-migration' into 'master'Kamil Trzciński2018-02-285-2/+102
| * | | | Merge branch '4879-support-private-https-urls-for-object-storage' into 'master'Sean McGivern2018-02-281-0/+24
| * | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-28200-1956/+7336
| |\ \ \ \
| * \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-28487-4418/+10097
| |\ \ \ \ \
| | * | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-2834-339/+453
| * | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-2821-52/+2000
| * | | | | | Merge branch 'use-send-url-for-incompatible-runners' into 'master'Grzegorz Bizon2018-02-282-4/+46
| * | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-2852-784/+2451
| * | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-28873-5724/+13122
| |\ \ \ \ \ \
| * | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-286-6/+161
| * | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-2813-48/+356
| * | | | | | | Merge branch 'jej/object-storage-uploader-migrate-with-license-callback' into...Kamil Trzciński2018-02-281-0/+10
| * | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-28544-4800/+22627
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-28781-9124/+20909
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-28719-7015/+23020
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-2811-66/+379
| * | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-28710-8902/+28810
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-281495-6566/+20350
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-2811-63/+462
* | | | | | | | | | | | | Merge branch 'fix/ldap_wihtout_user' into 'master'Douwe Maan2018-03-271-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix LDAP login without user in DBHoratiu Eugen Vlad2018-03-271-4/+10
* | | | | | | | | | | | | | Merge branch 'dz-improve-app-settings' into 'master'Filipa Lacerda2018-03-262-28/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \