summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Port of [10.2] Sanitizes IPython notebook output2237-ipythonFilipa Lacerda2018-01-057-4/+207
* Merge branch '41567-projectfix-10-1' into 'security-10-1'Sean McGivern2018-01-058-20/+133
|\
| * check project access on MR createJan Provaznik2018-01-058-20/+133
* | Merge branch 'milestones-finder-order-fix-10-1' into 'security-10-1'Robert Speicher2018-01-057-54/+43
|\ \
| * | Remove order param from the MilestoneFinderJarka Kadlecová2018-01-057-54/+43
* | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-1' into 'securit...Douwe Maan2018-01-0531-137/+380
|\ \ \ | |_|/ |/| |
| * | Backport to 10.1Francisco Javier López2018-01-0531-137/+380
|/ /
* | Merge branch '10-1-stable' into security-10-1Stan Hu2018-01-032-15/+15
|\ \
| * | Merge branch 'sh-bump-redis-actionpack' into 'master'Robert Speicher2018-01-032-15/+15
* | | Merge branch 'sh-validate-path-project-import-10-1' into 'security-10-1'Robert Speicher2018-01-034-2/+71
|\ \ \
| * | | Validate project path in Gitlab importStan Hu2018-01-034-2/+71
* | | | Merge branch 'security-ac/fix-path-traversal-10-1' into 'security-10-1'Robert Speicher2018-01-034-2/+83
|\ \ \ \
| * | | | Fix path traversal in gitlab-ci.yml cache:keyAlessio Caiazza2018-01-034-2/+83
|/ / / /
* | | | Merge branch 'mk-merge-10-1-stable-into-security-10-1' into 'security-10-1'Michael Kozono2018-01-0265-171/+587
|\ \ \ \ | |/ / / |/| | |
| * | | Resolve conflicts for OAuth phishing prevention changesKushal Pandya2018-01-022-10/+0
| * | | Merge branch '10-1-stable' into security-10-1Michael Kozono2017-12-2165-167/+593
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge branch 'winh-10-1-changelog-entries-docs' into '10-1-stable'Michael Kozono2017-12-181-0/+34
| | |\
| | | * Add changelog entries for 10.1.5 and 10.0.7Winnie Hellmann2017-12-181-0/+34
| | |/
| | * Update VERSION to 10.1.4v10.1.4Felipe Artur2017-11-141-1/+1
| | * Update CHANGELOG.md for 10.1.4Felipe Artur2017-11-145-21/+10
| | * Merge branch '10-1-stable-patch-4' into '10-1-stable'Felipe Artur2017-11-1412-10/+116
| | |\
| | | * Merge branch 'dm-authorize-admin-oauth-application' into 'master'Sean McGivern2017-11-142-5/+14
| | | * Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-143-2/+24
| | | * Merge branch 'issue_40058' into 'master'Sean McGivern2017-11-143-1/+13
| | | * Merge branch '40092-fix-cluster-size' into 'master'Tim Zallmann2017-11-144-2/+65
| | |/
| | * Update VERSION to 10.1.3v10.1.310-1-stable-patch-3Felipe Artur2017-11-101-1/+1
| | * Update CHANGELOG.md for 10.1.3Felipe Artur2017-11-1014-67/+16
| | * Merge branch '10-1-stable-patch-2' into '10-1-stable'Felipe Artur2017-11-1065-135/+463
| | |\
| | | * Merge branch 'issue_39773_be' into 'master'10-1-stable-patch-2Sean McGivern2017-11-103-11/+43
| | | * Merge branch '10-1-stable' into 10-1-stable-patch-2Lin Jen-Shin2017-11-102-1/+7
| | | |\ | | | |/ | | |/|
| | * | Merge branch '32059-fix-oauth-phishing' into 'master'Douwe Maan2017-11-106-7/+51
| | | * Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-105-9/+47
| | | * Solved conflictsJose Ivan Vargas2017-11-101-69/+1
| | | * Merge branch '10-1-stable' into 10-1-stable-patch-2Lin Jen-Shin2017-11-101-0/+2
| | | |\ | | | |/ | | |/|
| | * | Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable'Stan Hu2017-11-091-0/+2
| | |\ \
| | | * | Add 10.1.2 security fixes to CHANGELOG.mdmk-add-security-fixes-to-changelog-10-1-stableMichael Kozono2017-11-091-0/+2
| | |/ /
| | | * Merge branch '39648-fix-gke-wording' into 'master'Filipa Lacerda2017-11-102-3/+3
| | | * Merge branch 'dm-block-group-and-project-creation-when-external-by-default' i...Sean McGivern2017-11-103-5/+14
| | | * Merge branch '38385-gpg-tooltips-not-working-in-safari' into 'master'Jacob Schatz2017-11-103-2/+7
| | | * Merge branch 'fix/import-export-arguments' into 'master'Douwe Maan2017-11-104-2/+17
| | | * Merge branch '10-1-jivl-fix-cancel-button-file-upload-new-issue' into 10-1-st...Lin Jen-Shin2017-11-103-0/+81
| | | |\
| | | | * Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'Filipa Lacerda2017-11-063-0/+81
| | | * | Merge branch '10-1-stable' into 10-1-stable-patch-2Lin Jen-Shin2017-11-109-31/+63
| | | |\ \ | | | |/ / | | |/| |
| | * | | Update VERSION to 10.1.2v10.1.2Lin Jen-Shin2017-11-081-1/+1
| | * | | Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-082-5/+4
| | * | | Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable2017-11-073-28/+29
| | * | | Merge branch '36099-api-responses-missing-x-content-type-options-header' into...Douwe Maan2017-11-073-1/+15
| | * | | Merge branch 'ssrf-protections-round-2' into 'security-10-1'Douwe Maan2017-11-072-1/+19
| | | |/ | | |/|
| | | * Merge branch 'docs/ci-disposable-env-fix' into 'master'Marcia Ramos2017-11-061-2/+2
| | | * Merge branch '39704-fix-webhooks_log_time' into 'master'Stan Hu2017-11-065-3/+8