summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'graphql-resolvers-complexity' into 'master'Ash McKenzie2019-05-0612-4/+146
|\
| * GraphQL - Add extra complexity for resolversJan Provaznik2019-05-0612-4/+146
|/
* Merge branch 'add-spec-for-optimistic-locking-error' into 'master'Mayra Cabrera2019-05-063-0/+65
|\
| * Fix editing issues and MRs with NULL lock_versionSean McGivern2019-05-063-0/+65
|/
* Merge branch 'upgrade-gitlab-ui' into 'master'Clement Ho2019-05-062-5/+5
|\
| * Upgrade GitLab UI to 3.10.0upgrade-gitlab-uiLukas Eipert2019-05-062-5/+5
* | Merge branch 'issue_57906_fix_github_import' into 'master'Sean McGivern2019-05-0611-1/+169
|\ \
| * | Fix issuables state_id nil when importing projects from GitHubFelipe Artur2019-05-0611-1/+169
|/ /
* | Merge branch 'ce-11194-fix-approvals-groups-all-available' into 'master'Fatih Acet2019-05-061-0/+4
|\ \ | |/ |/|
| * Add close_select2 method to select2_helperce-11194-fix-approvals-groups-all-availablePaul Slaughter2019-05-011-0/+4
* | Merge branch 'add-mayra-cabrera-to-codeowners' into 'master'Sean McGivern2019-05-061-2/+2
|\ \
| * | Add Mayra Cabrera to codeownersMayra Cabrera2019-05-061-2/+2
|/ /
* | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Clement Ho2019-05-062-5/+5
|\ \
| * | Update dependency @gitlab/svgs to ^1.60.0Lukas 'Eipi' Eipert2019-05-062-5/+5
* | | Merge branch '61469-align-play-icon' into 'master'Kushal Pandya2019-05-063-1/+11
|\ \ \
| * | | Aligns the play button for stages61469-align-play-iconFilipa Lacerda2019-05-063-1/+11
* | | | Merge branch '51963-support-prometheus-for-group-level-clusters-backend' into...Bob Van Landuyt2019-05-0610-12/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Show health graphs on group-levelPeter Leitzen2019-05-0610-12/+32
|/ / /
* | | Merge branch '61431-move-build-qa-image-to-test-stage' into 'master'Stan Hu2019-05-061-1/+1
|\ \ \
| * | | Move the build-qa-image to the test stageRémy Coutable2019-05-061-1/+1
* | | | Merge branch 'its-simple-just-destroy-the-mirrors' into 'master'Nick Thomas2019-05-069-149/+29
|\ \ \ \
| * | | | Destroy repo mirrors instead of disabling themLuke Bennett2019-05-069-149/+29
|/ / / /
* | | | Merge branch '46806-typed-ci-variables' into 'master'Lin Jen-Shin2019-05-0637-49/+237
|\ \ \ \
| * | | | Implement support for CI variables of type fileKrasimir Angelov2019-05-0637-49/+237
|/ / / /
* | | | Merge branch '61203-fix-lfs-ui-upload' into 'master'Nick Thomas2019-05-063-1/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix uploading of LFS tracked file through UIPatrick Bajao2019-05-063-1/+32
|/ / /
* | | Merge branch 'qa-escape-netrc-regex' into 'master'Sanad Liaquat2019-05-062-1/+10
|\ \ \
| * | | Swap brackets to avoid false positiveqa-escape-netrc-regexMark Lapierre2019-05-061-1/+1
| * | | Escape arg used in regexMark Lapierre2019-05-062-1/+10
* | | | Merge branch '61222-reporters-can-create-labels-in-projects-groups' into 'mas...Achilleas Pipinellis2019-05-061-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Correct label permissions documentation61222-reporters-can-create-labels-in-projects-groupsSean McGivern2019-05-021-2/+2
* | | | Merge branch '10090-move-ee-differences-for-app-assets-javascripts-pages-proj...Filipa Lacerda2019-05-061-1/+1
|\ \ \ \
| * | | | Resolved EE differences for issues page indexConstance Okoghenun2019-05-061-1/+1
|/ / / /
* | | | Merge branch '30093-apply-bfg-object-map-to-database' into 'master'Douwe Maan2019-05-0614-123/+302
|\ \ \ \
| * | | | Remove cleaned up OIDs from database and cacheNick Thomas2019-05-0614-123/+302
* | | | | Merge branch 'create-merge-request-pipeline-on-chained-merge-ref-ce' into 'ma...Andreas Brandl2019-05-062-0/+32
|\ \ \ \ \
| * | | | | Create ActiveRecordModel and table for Merge Train featureShinya Maeda2019-05-062-0/+32
| | |_|/ / | |/| | |
* | | | | Merge branch '58105-pipeline-author-and-commit-author-too-close-together-in-p...Filipa Lacerda2019-05-069-65/+118
|\ \ \ \ \
| * | | | | Add localization for 'API' in triggerer column58105-pipeline-author-and-commit-author-too-close-together-in-pipeline-listmfluharty2019-05-032-1/+6
| * | | | | Separate tests for triggerer componentmfluharty2019-05-033-50/+56
| * | | | | Add pipeline triggerer column, adjust columnsmfluharty2019-05-036-15/+57
* | | | | | Merge branch 'jc-disconnect-git-alternates-client' into 'master'Stan Hu2019-05-065-3/+86
|\ \ \ \ \ \
| * | | | | | Add client methods for DisconnectGitAlternates rpcjc-disconnect-git-alternates-clientJohn Cai2019-05-035-3/+86
* | | | | | | Merge branch 'fix-merge-request-pipeline-exist-method' into 'master'Bob Van Landuyt2019-05-0611-33/+34
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix merge request pipeline exist methodfix-merge-request-pipeline-exist-methodShinya Maeda2019-05-0611-33/+34
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jej/session-stored-globaly' into 'master'Dmitriy Zaporozhets2019-05-065-0/+103
|\ \ \ \ \ \
| * | | | | | Session stored globally per requestjej/session-stored-globalyJames Edwards-Jones2019-05-025-0/+103
* | | | | | | Merge branch 'ce-11225-es_limited_namespaces_removal' into 'master'Nick Thomas2019-05-061-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Backport of 328-versioned-es-schemace-11225-es_limited_namespaces_removalMario de la Ossa2019-05-021-0/+6
* | | | | | | | Merge branch 'fix-search-bar-specs' into 'master'Tim Zallmann2019-05-062-27/+24
|\ \ \ \ \ \ \ \