Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge EE docs into CEdocs/ee-to-ce | Achilleas Pipinellis | 2019-03-12 | 634 | -665/+20964 |
* | Merge branch '58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source... | Nick Thomas | 2019-03-12 | 2 | -1/+6 |
|\ | |||||
| * | Fix UI for closed MR when source project is removed | Takuya Noguchi | 2019-03-11 | 2 | -1/+6 |
* | | Merge branch 'tag-pipeline-asset-image' into 'master' | Rémy Coutable | 2019-03-12 | 2 | -1/+7 |
|\ \ | |||||
| * | | Tag asset docker image with GitLab version also | Balasankar "Balu" C | 2019-03-12 | 2 | -1/+7 |
* | | | Merge branch 'qa-quarantine-add-member-test' into 'master' | Sanad Liaquat | 2019-03-12 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Quarantine failing test | Mark Lapierre | 2019-03-12 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge branch 'gitaly-version-v1.28.0' into 'master' | Douwe Maan | 2019-03-12 | 2 | -1/+6 |
|\ \ \ | |||||
| * | | | Upgrade Gitaly to v1.28.0 | GitalyBot | 2019-03-12 | 2 | -1/+6 |
|/ / / | |||||
* | | | Merge branch '58789-some-system-notes-on-issuable-are-folded-on-mobile' into ... | Annabel Dunstone Gray | 2019-03-12 | 4 | -37/+31 |
|\ \ \ | |||||
| * | | | Keep inline as much as possible in system notes on issuable | Takuya Noguchi | 2019-03-12 | 4 | -37/+31 |
* | | | | Merge branch '58781-silent-progress-in-auto-devops' into 'master' | Kamil Trzciński | 2019-03-12 | 2 | -4/+9 |
|\ \ \ \ | |||||
| * | | | | Use curl silent/show-error options on Auto DevOps | Takuya Noguchi | 2019-03-11 | 2 | -4/+9 |
* | | | | | Merge branch 'ce-9826-fix-broken-downstreams' into 'master' | Kamil Trzciński | 2019-03-12 | 2 | -3/+17 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | CE port for expanded pipelines | Filipa Lacerda | 2019-03-07 | 2 | -3/+17 |
* | | | | | Merge branch 'fix-ide-web-worker-relative-url' into 'master' | Filipa Lacerda | 2019-03-12 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed Web IDE web workers not loading with relative root URL | Phil Hughes | 2019-03-12 | 2 | -1/+6 |
* | | | | | | Merge branch 'revert-b923d1b5' into 'master' | Sean McGivern | 2019-03-12 | 1 | -19/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Merge branch 'check_pg_stat_activity' into 'master'" | Thong Kuah | 2019-03-12 | 1 | -19/+0 |
* | | | | | | | Merge branch '52447-auto-devops-at-group-level' into 'master' | Kamil Trzciński | 2019-03-12 | 25 | -38/+789 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable/disable Auto DevOps at Group level | Mayra Cabrera | 2019-03-12 | 25 | -38/+789 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'renovate/gitlab-ui-2.x' into 'master' | Phil Hughes | 2019-03-12 | 2 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update dependency @gitlab/ui to ^2.2.3 | Lukas 'Eipi' Eipert | 2019-03-11 | 2 | -5/+5 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sh-store-rspec-profiling-csv' into 'master' | Rémy Coutable | 2019-03-12 | 3 | -16/+87 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Batch insert CI rspec_profiling data | Stan Hu | 2019-03-12 | 3 | -16/+87 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-emojis-fixture-creating-ee-specific-file' into 'master' | Lin Jen-Shin | 2019-03-12 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't create EE-specific files when creating Emojis fixture files | Rémy Coutable | 2019-03-12 | 1 | -0/+2 |
* | | | | | | | Merge branch 'label-issues-and-merge-requests-in-seeds' into 'master' | Lin Jen-Shin | 2019-03-12 | 6 | -106/+60 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Add labels to seeded issues and merge requests | Rémy Coutable | 2019-03-12 | 6 | -106/+60 |
| |/ / / / / | |||||
* | | | | | | Merge branch '10080-env-contaier' into 'master' | Phil Hughes | 2019-03-12 | 2 | -5/+44 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Removes ee differences for container.vue | Filipa Lacerda | 2019-03-11 | 2 | -5/+44 |
* | | | | | | | Merge branch '58671-build-qa-image-should-have-a-higher-git-clone-depth' into... | Lin Jen-Shin | 2019-03-12 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Increase Git clone depth to 50 for the build-qa-image job | Rémy Coutable | 2019-03-12 | 1 | -0/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '10029-env-item' into 'master' | Phil Hughes | 2019-03-12 | 4 | -1/+32 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Removes EE differences from environmnet_item | Filipa Lacerda | 2019-03-11 | 4 | -1/+32 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'docs-fix-convdev-note' into 'master' | Evan Read | 2019-03-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix note alert box in convdev doc | Caleb Williamson | 2019-03-11 | 1 | -1/+1 |
* | | | | | | | Merge branch 'olliverschinagl/gitlab-ce-clarify_master_branch_name' into 'mas... | Evan Read | 2019-03-12 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc Clarify the special branch 'master' | Toon Claes | 2019-03-12 | 1 | -1/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'mc/docs/trigger-token-warning' into 'master' | Evan Read | 2019-03-12 | 1 | -3/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Resolve "A lot of Trigger Token is Accessible from Internet because of the Do... | Matija Čupić | 2019-03-12 | 1 | -3/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'docs-settesttimeout-jest-fe' into 'master' | Evan Read | 2019-03-12 | 1 | -5/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update setTestTimeout documentation | Luke Bennett | 2019-03-12 | 1 | -5/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'patch-17' into 'master' | Evan Read | 2019-03-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc/ci/yaml: correct recursive expanded includes documentation | Elan Ruusamäe | 2019-03-12 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'patch-14' into 'master' | Evan Read | 2019-03-11 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc: ci/include: note about caching | Elan Ruusamäe | 2019-03-11 | 1 | -0/+8 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'jc-upgrade-gitaly-1.27.0' into 'master' | Stan Hu | 2019-03-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Upgrading gitaly version to 1.27.0 | John Cai | 2019-03-11 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mg-remove-node6-support' into 'master' | Clement Ho | 2019-03-11 | 7 | -26/+18 |
|\ \ \ \ \ \ \ |