summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.1.7v10.1.710-1-stableOswaldo Ferreira2018-01-181-1/+1
* Update CHANGELOG.md for 10.1.7Oswaldo Ferreira2018-01-181-0/+4
* Merge branch 'fj-42112-fix-deploy-keys-migration-mysql-10-1' into '10-1-stable'Stan Hu2018-01-173-28/+111
|\
| * [10.1] Fix bug in security release with deploy keys migrationFrancisco Javier López2018-01-173-28/+111
|/
* Update VERSION to 10.1.6v10.1.6Oswaldo Ferreira2018-01-111-1/+1
* Update CHANGELOG.md for 10.1.6Oswaldo Ferreira2018-01-119-41/+14
* Merge branch '10-1-stable-patch-6' into '10-1-stable'Oswaldo Ferreira2018-01-1092-273/+1250
|\
| * Merge branch 'jej/fix-disabled-oauth-access-10-1' into 'security-10-1'Robert Speicher2018-01-098-13/+118
| * Merge branch 'fl-ipython' into 'security-10-1'Phil Hughes2018-01-097-4/+206
| * Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-085-1/+28
| * Merge branch 'fix/import-rce-10-1' into 'security-10-1'James Lopez2018-01-085-16/+68
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-1' into 'securit...Douwe Maan2018-01-0831-137/+380
| * Merge branch '41567-projectfix-10-1' into 'security-10-1'Sean McGivern2018-01-088-20/+133
| * Merge branch 'security-ac/fix-path-traversal-10-1' into 'security-10-1'Robert Speicher2018-01-084-2/+83
| * Merge branch 'sh-validate-path-project-import-10-1' into 'security-10-1'Robert Speicher2018-01-084-2/+71
| * Merge branch 'milestones-finder-order-fix-10-1' into 'security-10-1'Robert Speicher2018-01-087-54/+43
| * Merge branch 'label-xss-10-1' into 'security-10-1'Jacob Schatz2018-01-082-1/+11
| * Merge branch 'ac/41346-xss-ci-job-output-backport-10-1' into 'security-10-1'Robert Speicher2018-01-083-5/+57
| * Merge branch 'security-10-1-do-not-expose-passwords-or-tokens-in-service-inte...Sean McGivern2018-01-089-18/+52
|/
* Merge branch 'sh-bump-redis-actionpack' into 'master'Robert Speicher2018-01-032-15/+15
* 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