summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mk-add-security-fixes-to-changelog-9-5-stable' into '9-5-stable'9-5-stableStan Hu2017-11-091-1/+2
|\
| * Add 9.5.10 security fixes to CHANGELOG.mdmk-add-security-fixes-to-changelog-9-5-stableMichael Kozono2017-11-091-1/+2
|/
* Update VERSION to 9.5.10v9.5.10Winnie Hellmann2017-11-081-1/+1
* Update CHANGELOG.md for 9.5.10Winnie Hellmann2017-11-081-0/+4
* Merge branch 'security-9-5-36099-api-responses-missing-x-content' into 'secur...Douwe Maan2017-11-073-1/+15
* Merge branch 'ssrf-protections-round-2-9-5' into 'security-9-5'Douwe Maan2017-11-072-1/+19
* Update VERSION to 9.5.9v9.5.9Jarka Kadlecova2017-10-161-1/+1
* Update CHANGELOG.md for 9.5.9Jarka Kadlecova2017-10-166-24/+8
* Merge branch '3435-backport-9-5' into 'security-9-5'Stan Hu2017-10-144-23/+2
|\
| * Merge branch 'security-9-5' into 3435-backport-9-5Stan Hu2017-10-141-1/+13
| |\ | |/ |/|
* | Merge branch 'acey-flakes' into 'master'Rémy Coutable2017-10-141-1/+13
| * Merge remote-tracking branch 'origin/security-9-5' into 3435-backport-9-5Stan Hu2017-10-14144-707/+2015
| |\ | |/ |/|
* | Fix conflicts in Gemfile.lockBrian Neel2017-10-14144-707/+2015
|\ \
| * | Merge branch '38126-security-username-change-9-5' into 'security-9-5'Douwe Maan2017-10-124-12/+49
| * | Merge branch 'winh-search-bar-xss-9.5' into 'security-9-5'Phil Hughes2017-10-123-2/+29
| * | Merge branch 'rs-sanitize-unicode-in-protocol-9-5' into 'security-9-5'Douwe Maan2017-10-123-2/+22
| * | Merge branch '37759-also-treat-newlines-as-separator' into 'master'Kamil Trzciński2017-10-123-14/+30
| * | Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0'Robert Speicher2017-10-123-10/+15
| * | Update VERSION to 9.5.8v9.5.8Jose Ivan Vargas2017-10-041-1/+1
| * | Update CHANGELOG.md for 9.5.8Jose Ivan Vargas2017-10-042-5/+4
| * | Merge branch 'fork-btn-enabled-user-groups' into 'master'Filipa Lacerda2017-10-0412-24/+146
| * | Update VERSION to 9.5.7v9.5.7Jose Ivan Vargas2017-10-031-1/+1
| * | Update CHANGELOG.md for 9.5.7Jose Ivan Vargas2017-10-032-4/+4
| * | Merge branch 'sh-import-repos-fix-9-5' into '9-5-stable'Robert Speicher2017-10-035-1/+28
| |\ \
| | * | Fix gitlab rake:import:repos tasksh-import-repos-fix-9-5Stan Hu2017-10-025-1/+28
| |/ /
| * | Update VERSION to 9.5.6v9.5.69-5-stable-patch-7Jose Ivan Vargas2017-09-291-1/+1
| * | Update CHANGELOG.md for 9.5.6Jose Ivan Vargas2017-09-295-21/+7
| * | Merge branch '38319-9-5-stable' into '9-5-stable-patch-6'9-5-stable-patch-6Jose Ivan Vargas Lopez2017-09-285-6/+88
| |\ \
| | * | Handle error when fetching ref for MR with deleted source branch38319-9-5-stableSean McGivern2017-09-285-6/+88
| * | | Merge branch 'winh-upgrade-nokogiri' into 'master'Robert Speicher2017-09-282-5/+6
| * | | Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-283-2/+12
| * | | Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'Fatih Acet2017-09-2810-25/+157
| * | | Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'Fatih Acet2017-09-284-3/+16
| |/ /
| * | Update VERSION to 9.5.5v9.5.5Simon Knox2017-09-181-1/+1
| * | Update CHANGELOG.md for 9.5.5Simon Knox2017-09-1817-84/+19
| * | Merge branch '36907-new-issue-from-failed-build-no-longer-links-to-failed-bui...9-5-stable-patch-5Grzegorz Bizon2017-09-153-6/+6
| * | Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'Rémy Coutable2017-09-152-4/+15
| * | Merge branch '9-5-stable' into '9-5-stable-patch-5'Simon Knox2017-09-167-6/+67
| |\ \
| | * \ Merge branch 'issue_37640_9_5_stable' into '9-5-stable'Grzegorz Bizon2017-09-157-6/+67
| | |\ \
| | | * | Fix migrationsissue_37640_9_5_stableFelipe Artur2017-09-143-17/+6
| | | * | Add migration to fix corrupted projectsFelipe Artur2017-09-144-3/+47
| | | * | Fix project feature being deleted when updating project with invalid visibili...Felipe Artur2017-09-125-5/+33
| | |/ /
| * | | Merge branch 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger...Kamil Trzciński2017-09-133-1/+9
| * | | Merge branch '9-5-stable-patch-5-1' into '9-5-stable-patch-5'Simon Knox2017-09-1221-161/+216
| |\ \ \
| | * | | Merge branch '36089-handle-ref-failure-better' into 'master'9-5-stable-patch-5-1Douwe Maan2017-09-1221-161/+216
| |/ / /
| * | | remove tests that should have been revertedSimon Knox2017-09-121-18/+0
| * | | fix docs-list task - update docs in previous locationSimon Knox2017-09-123-248/+3
| * | | change committer back to user for specSimon Knox2017-09-121-3/+3
| * | | Merge branch '35804-document-table-based-tests' into 'master'Robert Speicher2017-09-114-0/+67
| * | | Revert "Merge branch 'sidebar-cache-updates' into 'master'"Jose Ivan Vargas2017-09-115-56/+0