summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Merge branch 'clarify-docs-about-external-artifacts-and-gitlab-pages' into 'm...Grzegorz Bizon2017-11-061-2/+4
| * Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'Stan Hu2017-11-063-13/+6
| * Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-0614-18/+182
| * Merge branch 'issue_39176' into 'master'Douwe Maan2017-11-063-1/+20
| * Merge branch 'sh-fix-environment-slug-generation' into 'master'Grzegorz Bizon2017-11-063-1/+25
| * Merge branch 'fix_migration_that_adds_ff_merge_field' into 'master'Stan Hu2017-11-062-1/+10
| * Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-11-063-1/+25
| * Merge branch 'gl-username-hook-fix' into 'master'Douwe Maan2017-11-062-14/+16
| * Merge branch '35955-searchable-settings-puts-expand-collapse-toggle-in-an-inv...Tim Zallmann2017-11-068-51/+55
| * Merge branch '39726-add-crsf-token-axios' into 'master'Phil Hughes2017-11-062-0/+8
|/
* Update VERSION to 10.1.1v10.1.1Winnie Hellmann2017-10-311-1/+1
* Update CHANGELOG.md for 10.1.1Winnie Hellmann2017-10-3122-107/+24
* Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-11-019-12/+35
* Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-11-017-1/+27
* Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-10-311-1/+4
* Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-314-16/+20
* Merge branch '39639-clusters-poll' into 'master'Phil Hughes2017-10-312-8/+19
* Merge branch 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_...Stan Hu2017-10-302-3/+3
* Merge branch '39426-update-fog-google-docs' into 'master'Achilleas Pipinellis2017-10-301-33/+90
* Merge branch '39054-activerecord-statementinvalid-pg-querycanceled-error-canc...Yorick Peterse2017-10-302-1/+6
* Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-307-59/+31
* Merge branch 'bvl-circuitbreaker-patch' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-3027-306/+470
|\
| * Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-3019-196/+275
| * Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-3021-127/+212
|/
* Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern2017-10-303-1/+12