summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge EE docs into CEdocs/ee-to-ceAchilleas Pipinellis2019-03-12634-665/+20964
* Merge branch '58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source...Nick Thomas2019-03-122-1/+6
|\
| * Fix UI for closed MR when source project is removedTakuya Noguchi2019-03-112-1/+6
* | Merge branch 'tag-pipeline-asset-image' into 'master'Rémy Coutable2019-03-122-1/+7
|\ \
| * | Tag asset docker image with GitLab version alsoBalasankar "Balu" C2019-03-122-1/+7
* | | Merge branch 'qa-quarantine-add-member-test' into 'master'Sanad Liaquat2019-03-121-1/+2
|\ \ \
| * | | Quarantine failing testMark Lapierre2019-03-121-1/+2
| |/ /
* | | Merge branch 'gitaly-version-v1.28.0' into 'master'Douwe Maan2019-03-122-1/+6
|\ \ \
| * | | Upgrade Gitaly to v1.28.0GitalyBot2019-03-122-1/+6
|/ / /
* | | Merge branch '58789-some-system-notes-on-issuable-are-folded-on-mobile' into ...Annabel Dunstone Gray2019-03-124-37/+31
|\ \ \
| * | | Keep inline as much as possible in system notes on issuableTakuya Noguchi2019-03-124-37/+31
* | | | Merge branch '58781-silent-progress-in-auto-devops' into 'master'Kamil Trzciński2019-03-122-4/+9
|\ \ \ \
| * | | | Use curl silent/show-error options on Auto DevOpsTakuya Noguchi2019-03-112-4/+9
* | | | | Merge branch 'ce-9826-fix-broken-downstreams' into 'master'Kamil Trzciński2019-03-122-3/+17
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | CE port for expanded pipelinesFilipa Lacerda2019-03-072-3/+17
* | | | | Merge branch 'fix-ide-web-worker-relative-url' into 'master'Filipa Lacerda2019-03-122-1/+6
|\ \ \ \ \
| * | | | | Fixed Web IDE web workers not loading with relative root URLPhil Hughes2019-03-122-1/+6
* | | | | | Merge branch 'revert-b923d1b5' into 'master'Sean McGivern2019-03-121-19/+0
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch 'check_pg_stat_activity' into 'master'"Thong Kuah2019-03-121-19/+0
* | | | | | | Merge branch '52447-auto-devops-at-group-level' into 'master'Kamil Trzciński2019-03-1225-38/+789
|\ \ \ \ \ \ \
| * | | | | | | Enable/disable Auto DevOps at Group levelMayra Cabrera2019-03-1225-38/+789
|/ / / / / / /
* | | | | | | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Phil Hughes2019-03-122-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Update dependency @gitlab/ui to ^2.2.3Lukas 'Eipi' Eipert2019-03-112-5/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sh-store-rspec-profiling-csv' into 'master'Rémy Coutable2019-03-123-16/+87
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Batch insert CI rspec_profiling dataStan Hu2019-03-123-16/+87
|/ / / / / /
* | | | | | Merge branch 'fix-emojis-fixture-creating-ee-specific-file' into 'master'Lin Jen-Shin2019-03-121-0/+2
|\ \ \ \ \ \
| * | | | | | Don't create EE-specific files when creating Emojis fixture filesRémy Coutable2019-03-121-0/+2
* | | | | | | Merge branch 'label-issues-and-merge-requests-in-seeds' into 'master'Lin Jen-Shin2019-03-126-106/+60
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add labels to seeded issues and merge requestsRémy Coutable2019-03-126-106/+60
| |/ / / / /
* | | | | | Merge branch '10080-env-contaier' into 'master'Phil Hughes2019-03-122-5/+44
|\ \ \ \ \ \
| * | | | | | Removes ee differences for container.vueFilipa Lacerda2019-03-112-5/+44
* | | | | | | Merge branch '58671-build-qa-image-should-have-a-higher-git-clone-depth' into...Lin Jen-Shin2019-03-121-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Increase Git clone depth to 50 for the build-qa-image jobRémy Coutable2019-03-121-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '10029-env-item' into 'master'Phil Hughes2019-03-124-1/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Removes EE differences from environmnet_itemFilipa Lacerda2019-03-114-1/+32
| |/ / / / /
* | | | | | Merge branch 'docs-fix-convdev-note' into 'master'Evan Read2019-03-121-1/+1
|\ \ \ \ \ \
| * | | | | | Fix note alert box in convdev docCaleb Williamson2019-03-111-1/+1
* | | | | | | Merge branch 'olliverschinagl/gitlab-ce-clarify_master_branch_name' into 'mas...Evan Read2019-03-121-1/+2
|\ \ \ \ \ \ \
| * | | | | | | doc Clarify the special branch 'master'Toon Claes2019-03-121-1/+2
|/ / / / / / /
* | | | | | | Merge branch 'mc/docs/trigger-token-warning' into 'master'Evan Read2019-03-121-3/+6
|\ \ \ \ \ \ \
| * | | | | | | Resolve "A lot of Trigger Token is Accessible from Internet because of the Do...Matija Čupić2019-03-121-3/+6
|/ / / / / / /
* | | | | | | Merge branch 'docs-settesttimeout-jest-fe' into 'master'Evan Read2019-03-121-5/+6
|\ \ \ \ \ \ \
| * | | | | | | Update setTestTimeout documentationLuke Bennett2019-03-121-5/+6
|/ / / / / / /
* | | | | | | Merge branch 'patch-17' into 'master'Evan Read2019-03-121-2/+2
|\ \ \ \ \ \ \
| * | | | | | | doc/ci/yaml: correct recursive expanded includes documentationElan Ruusamäe2019-03-121-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'patch-14' into 'master'Evan Read2019-03-111-0/+8
|\ \ \ \ \ \ \
| * | | | | | | doc: ci/include: note about cachingElan Ruusamäe2019-03-111-0/+8
|/ / / / / / /
* | | | | | | Merge branch 'jc-upgrade-gitaly-1.27.0' into 'master'Stan Hu2019-03-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Upgrading gitaly version to 1.27.0John Cai2019-03-111-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'mg-remove-node6-support' into 'master'Clement Ho2019-03-117-26/+18
|\ \ \ \ \ \ \