Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 13 | -17/+289 |
|\ | |||||
| * | Backport EE changes | Micaël Bergeron | 2018-03-22 | 1 | -0/+0 |
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 56 | -161/+732 |
| |\ | |||||
| * | | Fix http_io to make it return path is nil | Shinya Maeda | 2018-03-22 | 1 | -1/+1 |
| * | | Backport ee-40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 1 | -0/+4 |
| * | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ce-4078... | Micaël Bergeron | 2018-03-09 | 1 | -23/+0 |
| |\ \ | |||||
| | * | | apply feedback | Micaël Bergeron | 2018-03-09 | 1 | -23/+0 |
| * | | | Add proxy_download to perform proxied sending of all files | Micaël Bergeron | 2018-03-09 | 6 | -16/+16 |
| |/ / | |||||
| * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 171 | -2611/+4481 |
| |\ \ | |||||
| * | | | [cherry-pick] '4862-verify-file-checksums' | Sean McGivern | 2018-03-08 | 6 | -0/+179 |
| * | | | fix some broken specs | Micaël Bergeron | 2018-03-06 | 1 | -1/+4 |
| * | | | removed EE specific code from the port | Micaël Bergeron | 2018-03-01 | 1 | -0/+183 |
| * | | | another round of fixes | Micaël Bergeron | 2018-03-01 | 3 | -0/+86 |
| * | | | 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 | 90 | -446/+1256 |
| |\ \ \ | |||||
| * \ \ \ | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 94 | -428/+1340 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 202 | -1078/+3016 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 8 | -22/+18 |
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -2/+10 |
| * | | | | | | Merge branch 'use-send-url-for-incompatible-runners' into 'master' | Grzegorz Bizon | 2018-02-28 | 3 | -3/+20 |
| * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 10 | -20/+21 |
| * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 139 | -1011/+2863 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -2/+2 |
| * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 288 | -2151/+6093 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 176 | -1329/+3656 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 183 | -1767/+5243 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Merge branch 'zj-fix-resolver-issue' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+1 |
| * | | | | | | | | | | Merge branch 'zj-improve-object-store-rake-task' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -3/+6 |
| * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master' | Douwe Maan | 2018-02-28 | 3 | -5/+29 |
| * | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 255 | -1943/+4794 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 218 | -2028/+4363 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master' | Grzegorz Bizon | 2018-02-28 | 3 | -2/+21 |
* | | | | | | | | | | | | | Merge branch 'fix/ldap_wihtout_user' into 'master' | Douwe Maan | 2018-03-27 | 4 | -18/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix LDAP login without user in DB | Horatiu Eugen Vlad | 2018-03-27 | 4 | -18/+13 |
* | | | | | | | | | | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master' | Kamil Trzciński | 2018-03-26 | 8 | -93/+197 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Make stage seed instance variables less ambiguousbackstage/gb/populating-pipeline-refactoring | Grzegorz Bizon | 2018-03-26 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | Fix static analysis and tests related to YAML processing | Grzegorz Bizon | 2018-03-22 | 1 | -30/+14 |
| * | | | | | | | | | | | | | | Add specs for pipeline chain that builds stages and jobs | Grzegorz Bizon | 2018-03-22 | 2 | -10/+10 |
| * | | | | | | | | | | | | | | Do not select included stage seeds in populate chain | Grzegorz Bizon | 2018-03-22 | 1 | -5/+2 |
| * | | | | | | | | | | | | | | Decouple YAML processor from pipeline objects | Grzegorz Bizon | 2018-03-22 | 1 | -34/+14 |
| * | | | | | | | | | | | | | | Move policy related specs our of YAML processor tests | Grzegorz Bizon | 2018-03-22 | 2 | -5/+11 |
| * | | | | | | | | | | | | | | Fix rubocop offense in pipeline build seed class | Grzegorz Bizon | 2018-03-22 | 1 | -13/+11 |
| * | | | | | | | | | | | | | | Add a guard clause to avoid creating empty stages | Grzegorz Bizon | 2018-03-21 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | Evaluate only/except policies outside of YAML processor | Grzegorz Bizon | 2018-03-21 | 3 | -9/+57 |
| * | | | | | | | | | | | | | | Make it easier to test pipeline stage seeds | Grzegorz Bizon | 2018-03-21 | 5 | -17/+17 |
| * | | | | | | | | | | | | | | Reduce stage seeds coupling between pipeline and YAML | Grzegorz Bizon | 2018-03-21 | 2 | -6/+6 |
| * | | | | | | | | | | | | | | Add specs for chain element that populates a pipeline | Grzegorz Bizon | 2018-03-21 | 1 | -1/+7 |
| * | | | | | | | | | | | | | | Populate pipeline with objects before creating it | Grzegorz Bizon | 2018-03-21 | 3 | -9/+32 |
| * | | | | | | | | | | | | | | Remove legacy service for creating pipeline stages | Grzegorz Bizon | 2018-03-21 | 3 | -11/+6 |
| * | | | | | | | | | | | | | | Decouple pipeline stage seeds from building environments | Grzegorz Bizon | 2018-03-21 | 3 | -7/+20 |
| * | | | | | | | | | | | | | | Support building all pipeline resource before saving | Grzegorz Bizon | 2018-03-21 | 3 | -24/+34 |