summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'Kamil Trzciński2018-03-291-1/+4
|\
| * Increase isolation of database migrations test modelsGrzegorz Bizon2018-03-291-1/+4
* | Merge branch 'ac/fix-use_file-race' into 'master'Kamil Trzciński2018-03-291-2/+14
|\ \ | |/ |/|
| * Add Gitlab::ExclusiveLease to ObjectStorage#use_fileAlessio Caiazza2018-03-291-2/+14
* | Make all workhorse gitaly calls opt-out, take 2Jacob Vosmaer2018-03-281-2/+4
|/
* Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-271-4/+9
* Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-273-0/+233
|\
| * remove lintMicaël Bergeron2018-03-221-4/+5
| * fix the failing specsMicaël Bergeron2018-03-221-1/+5
| * Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-221-0/+40
| |\
| * \ Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0820-142/+918
| |\ \
| * | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-081-0/+45
| * | | remove geo specific codeMicaël Bergeron2018-03-011-0/+48
| * | | remove the license checkMicaël Bergeron2018-03-011-3/+1
| * | | another round of fixesMicaël Bergeron2018-03-011-49/+0
| * | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2814-116/+744
| |\ \ \
| * | | | Merge branch 'fix/sm/atomic-migration' into 'master'Kamil Trzciński2018-02-281-0/+49
| * | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-289-17/+442
| |\ \ \ \
| * \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2820-37/+372
| |\ \ \ \ \
| | * | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-284-86/+28
| * | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-281-0/+64
| * | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-285-28/+171
| * | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2822-22/+387
| |\ \ \ \ \ \
| * | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-281-1/+2
| * | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-1/+1
| * | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-2821-48/+448
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-2854-184/+647
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-2820-59/+799
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-282-26/+32
| * | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-2835-80/+275
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-2839-80/+1153
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-281-0/+26
* | | | | | | | | | | | | Merge branch '43316-controller-parameters-handling-sensitive-information-shou...Kamil Trzciński2018-03-261-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-nameMatija Čupić2018-03-221-3/+3
| * | | | | | | | | | | | | Use secret_key and secret_value in Variables controllerMatija Čupić2018-03-161-8/+8
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-233-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-213-4/+8
| |/ / / / / / / / / / /
* | | | | | | | | | | | Address review comments.Andreas Brandl2018-03-161-3/+5
* | | | | | | | | | | | Add shared specs for AtomicInternalId concern.Andreas Brandl2018-03-161-0/+38
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'tc-geo-local-only-counts-matcher' into 'master'Nick Thomas2018-03-071-0/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add matcher to match elements by idstc-geo-local-only-counts-matcherToon Claes2018-03-061-0/+24
* | | | | | | | | | | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-072-0/+375
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add discussion APIjprovazn-apiJan Provaznik2018-03-072-0/+375
* | | | | | | | | | | | Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-063-8/+56
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gitaly-lfs-changes' into 'master'Douwe Maan2018-03-051-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChangesgitaly-lfs-changesAlejandro Rodríguez2018-03-021-4/+10
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ...Rémy Coutable2018-03-051-4/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-actionSean McGivern2018-03-021-4/+1
| * | | | | | | | | | | | | Merge branch 'ee-4862-verify-file-checksums' into 'master'Sean McGivern2018-03-051-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksumsNick Thomas2018-03-021-0/+45
| | |/ / / / / / / / / / /