summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'"revert-04c3c6ddKamil Trzciński2019-05-2217-286/+47
* Merge branch 'docs-issue-workflow-group-labels' into 'master'Rémy Coutable2019-05-221-0/+21
|\
| * Add group label docs to Issue WorkflowMark Fletcher2019-05-221-0/+21
* | Update VERSION to 11.12.0-prev11.12.0.preGitLab Release Tools Bot2019-05-221-1/+1
* | Update CHANGELOG.md for 11.11.0GitLab Release Tools Bot2019-05-22166-832/+185
* | Merge branch '61935-remove-code-left-over-from-when-clusters-were-always-proj...Nick Thomas2019-05-2215-106/+94
|\ \
| * | Remove legacy Kubernetes #actual_namespace61935-remove-code-left-over-from-when-clusters-were-always-project-specificTiger2019-05-2115-106/+94
* | | Merge branch 'jc-git-deduplication-service' into 'master'Nick Thomas2019-05-223-1/+157
|\ \ \ | |_|/ |/| |
| * | Add GitDeduplicationService for deduplication housekeepingjc-git-deduplication-serviceJohn Cai2019-05-213-1/+157
* | | Merge branch 'js-i18n-s' into 'master'Filipa Lacerda2019-05-224-4/+11
|\ \ \
| * | | I18N JS files starting with sjs-i18n-sBrandon Labuschagne2019-05-214-4/+11
* | | | Merge branch 'docs/minor-improvement-on-resources-doc' into 'master'Rémy Coutable2019-05-221-1/+1
|\ \ \ \
| * | | | Minor improvement on resources docWalmyr Lima2019-05-221-1/+1
* | | | | Merge branch 'docs/make-qa-tests-easy-part-2' into 'master'Rémy Coutable2019-05-221-3/+105
|\ \ \ \ \
| * | | | | Update writing e2e tests docWalmyr2019-05-221-3/+105
|/ / / / /
* | | | | Merge branch 'reorganize-tests-jobs-by-level' into 'master'Kamil Trzciński2019-05-2217-47/+286
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reorganize test jobs by levelreorganize-tests-jobs-by-levelRémy Coutable2019-05-2015-41/+280
| * | | | Update simplecov to avoid invalid UTF-8 crashesRémy Coutable2019-05-202-6/+6
* | | | | Merge branch 'repo-list-row-component' into 'master'Filipa Lacerda2019-05-229-5/+343
|\ \ \ \ \
| * | | | | Added tree list row componentPhil Hughes2019-05-219-5/+343
* | | | | | Merge branch '8723-geo-remove-gitlab-lfstoken-legacyredisdevisetoken-implemen...Ash McKenzie2019-05-223-117/+28
|\ \ \ \ \ \
| * | | | | | Geo: Remove Gitlab::LfsToken::LegacyRedisDeviseToken implementationValery Sizov2019-05-223-117/+28
* | | | | | | Merge branch '61441' into 'master'James Lopez2019-05-223-4/+24
|\ \ \ \ \ \ \
| * | | | | | | #61441 Allow user to set email ID before setting up 2FAKartikey Tanna2019-05-223-4/+24
|/ / / / / / /
* | | | | | | Merge branch 'import-form-scb' into 'master'Phil Hughes2019-05-221-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Resolve CE/EE diffs in import formLuke Bennett2019-05-221-0/+3
* | | | | | | | Merge branch 'dropdown-user-scb' into 'master'Phil Hughes2019-05-221-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve CE/EE diffs in dropdown_userLuke Bennett2019-05-221-0/+14
| |/ / / / / / /
* | | | | | | | Merge branch 'api-spec-scb' into 'master'Phil Hughes2019-05-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve CE/EE diffs in api_specLuke Bennett2019-05-221-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'label-row-scb' into 'master'Phil Hughes2019-05-221-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve CE/EE diffs in label rowlabel-row-scbLuke Bennett2019-05-211-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'signin-box-scb' into 'master'Phil Hughes2019-05-221-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve CE/EE diffs in signin boxsignin-box-scbLuke Bennett2019-05-211-2/+6
| |/ / / / / / /
* | | | | | | | Merge branch 'admin-users-form-scb' into 'master'Phil Hughes2019-05-221-0/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Resolve CE/EE diffs in admin users formadmin-users-form-scbLuke Bennett2019-05-211-0/+6
* | | | | | | | Merge branch 'sh-fix-linter-registry-haml-try2' into 'master'Ash McKenzie2019-05-225-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Move files from lib/haml_lint to haml_lintsh-fix-linter-registry-hamlStan Hu2019-05-215-2/+3
| * | | | | | | | Fix uninitialized constant with HamlLint::LinterRegistryStan Hu2019-05-212-2/+2
* | | | | | | | | Merge branch 'qa-contain-chrome-vars' into 'master'Mark Lapierre2019-05-221-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move Chrome variables under conditionalqa-contain-chrome-varsddavison2019-05-201-3/+3
* | | | | | | | | | Merge branch 'dz-scope-project-routes' into 'master'Stan Hu2019-05-228-39/+84
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add network and graphs to legacy routes toodz-scope-project-routesDmitriy Zaporozhets2019-05-212-1/+3
| * | | | | | | | | | Add legacy routes for modified project pathDmitriy Zaporozhets2019-05-213-0/+34
| * | | | | | | | | | Fix specs to match route changesDmitriy Zaporozhets2019-05-204-24/+25
| * | | | | | | | | | Move project settings under /-/ scopeDmitriy Zaporozhets2019-05-201-14/+17
| * | | | | | | | | | Move some project routes under /-/ scopeDmitriy Zaporozhets2019-05-202-1/+6
* | | | | | | | | | | Merge branch 'qa-quarantine-object-storage-test' into 'master'Mark Lapierre2019-05-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Quarantine failing testqa-quarantine-object-storage-testMark Lapierre2019-05-211-1/+2
* | | | | | | | | | | Merge branch 'dd-qa-api-delegation-project-cicd-vars' into 'master'Sanad Liaquat2019-05-213-2/+40
|\ \ \ \ \ \ \ \ \ \ \