Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master' | Kamil Trzciński | 2018-03-29 | 1 | -1/+4 |
|\ | |||||
| * | Increase isolation of database migrations test models | Grzegorz Bizon | 2018-03-29 | 1 | -1/+4 |
* | | Merge branch 'ac/fix-use_file-race' into 'master' | Kamil Trzciński | 2018-03-29 | 1 | -2/+14 |
|\ \ | |/ |/| | |||||
| * | Add Gitlab::ExclusiveLease to ObjectStorage#use_file | Alessio Caiazza | 2018-03-29 | 1 | -2/+14 |
* | | Make all workhorse gitaly calls opt-out, take 2 | Jacob Vosmaer | 2018-03-28 | 1 | -2/+4 |
|/ | |||||
* | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce | Alessio Caiazza | 2018-03-27 | 1 | -4/+9 |
* | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 3 | -0/+233 |
|\ | |||||
| * | remove lint | Micaël Bergeron | 2018-03-22 | 1 | -4/+5 |
| * | fix the failing specs | Micaël Bergeron | 2018-03-22 | 1 | -1/+5 |
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 1 | -0/+40 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 20 | -142/+918 |
| |\ \ | |||||
| * | | | [cherry-pick] '4862-verify-file-checksums' | Sean McGivern | 2018-03-08 | 1 | -0/+45 |
| * | | | remove geo specific code | Micaël Bergeron | 2018-03-01 | 1 | -0/+48 |
| * | | | remove the license check | Micaël Bergeron | 2018-03-01 | 1 | -3/+1 |
| * | | | another round of fixes | Micaël Bergeron | 2018-03-01 | 1 | -49/+0 |
| * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 14 | -116/+744 |
| |\ \ \ | |||||
| * | | | | Merge branch 'fix/sm/atomic-migration' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+49 |
| * | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 9 | -17/+442 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 20 | -37/+372 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 4 | -86/+28 |
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+64 |
| * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 5 | -28/+171 |
| * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 22 | -22/+387 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -1/+2 |
| * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -1/+1 |
| * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 21 | -48/+448 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 54 | -184/+647 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 20 | -59/+799 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master' | Douwe Maan | 2018-02-28 | 2 | -26/+32 |
| * | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 35 | -80/+275 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 39 | -80/+1153 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -0/+26 |
* | | | | | | | | | | | | | Merge branch '43316-controller-parameters-handling-sensitive-information-shou... | Kamil Trzciński | 2018-03-26 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name | Matija Čupić | 2018-03-22 | 1 | -3/+3 |
| * | | | | | | | | | | | | | Use secret_key and secret_value in Variables controller | Matija Čupić | 2018-03-16 | 1 | -8/+8 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'mark-legacy-git-access' into 'master' | Sean McGivern | 2018-03-23 | 3 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Route path lookups through legacy_disk_pathmark-legacy-git-access | Jacob Vosmaer | 2018-03-21 | 3 | -4/+8 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Address review comments. | Andreas Brandl | 2018-03-16 | 1 | -3/+5 |
* | | | | | | | | | | | | Add shared specs for AtomicInternalId concern. | Andreas Brandl | 2018-03-16 | 1 | -0/+38 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'tc-geo-local-only-counts-matcher' into 'master' | Nick Thomas | 2018-03-07 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add matcher to match elements by idstc-geo-local-only-counts-matcher | Toon Claes | 2018-03-06 | 1 | -0/+24 |
* | | | | | | | | | | | | Merge branch 'jprovazn-api' into 'master' | Sean McGivern | 2018-03-07 | 2 | -0/+375 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add discussion APIjprovazn-api | Jan Provaznik | 2018-03-07 | 2 | -0/+375 |
* | | | | | | | | | | | | Merge branch 'master' into 'issue_38337' | Felipe Artur | 2018-03-06 | 3 | -8/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gitaly-lfs-changes' into 'master' | Douwe Maan | 2018-03-05 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChangesgitaly-lfs-changes | Alejandro Rodríguez | 2018-03-02 | 1 | -4/+10 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ... | Rémy Coutable | 2018-03-05 | 1 | -4/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action | Sean McGivern | 2018-03-02 | 1 | -4/+1 |
| * | | | | | | | | | | | | | Merge branch 'ee-4862-verify-file-checksums' into 'master' | Sean McGivern | 2018-03-05 | 1 | -0/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksums | Nick Thomas | 2018-03-02 | 1 | -0/+45 |
| | |/ / / / / / / / / / / |