summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 9.1.6v9.1.6Regis2017-06-021-1/+1
* Update CHANGELOG.md for 9.1.6Regis2017-06-022-4/+4
* Add the `with_avatar` trait to projects factoryBob Van Landuyt2017-06-021-0/+4
* Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-0214-19/+207
* Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'Sean McGivern2017-06-023-2/+13
* Update VERSION to 9.1.5v9.1.5Regis2017-05-311-1/+1
* Update CHANGELOG.md for 9.1.5Regis2017-05-314-12/+6
* Merge branch 'dz-restrict-autocomplete' into 'security-9-1' Robert Speicher2017-05-313-11/+25
* Merge branch 'bvl-security-9-1-28917-contain-uploads-in-system-dir' into 'sec...Douwe Maan2017-05-3135-45/+960
* Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher2017-05-312-0/+5
* Revert "Merge remote-tracking branch 'dev/security-9-1' into 9-1-stable"Timothy Andrew2017-05-3043-1002/+56
* Merge remote-tracking branch 'dev/security-9-1' into 9-1-stableTimothy Andrew2017-05-3043-56/+1002
|\
| * Merge remote-tracking branch 'origin/9-1-stable' into security-9-1Timothy Andrew2017-05-26103-589/+2065
| |\ | |/ |/|
* | Update CHANGELOG.md for 9.1.4Felipe Artur2017-05-121-0/+1
* | Update CHANGELOG.md for 9.1.4Felipe Artur2017-05-121-0/+1
* | Update CHANGELOG.md for 9.1.4Felipe Artur2017-05-121-0/+1
* | Update VERSION to 9.1.4v9.1.4Felipe Artur2017-05-121-1/+1
* | Update CHANGELOG.md for 9.1.4Felipe Artur2017-05-129-33/+11
* | Merge branch 'fix/project-tree-saver-spec' into 'master'Rémy Coutable2017-05-122-2/+3
* | Merge branch 'fix/fork-spec-mysql' into 'master'Stan Hu2017-05-121-1/+3
* | Merge branch '31978-cross-reference-fix' into 'master' Sean McGivern2017-05-123-6/+88
* | Merge branch 'fix/gb/qa/fix-outdated-admin-area-link-title' into 'master' Rémy Coutable2017-05-121-1/+1
* | Remove unexistent packages from dispatcher.jsFelipe Artur2017-05-121-2/+0
* | Merge branch '9-1-stable-cherry-pick-fallback-localstorage-cases' into '9-1-s...Felipe Artur2017-05-1019-41/+684
|\ \
| * | Merge branch 'fallback-localstorage-cases' into 'master'9-1-stable-cherry-pick-fallback-localstorage-casesPhil Hughes2017-05-1019-41/+684
|/ /
* | Merge branch 'fix/import-export-missing-attributes' into 'master' Rémy Coutable2017-05-1013-14/+113
* | Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master'Jacob Schatz2017-05-104-3/+53
* | Merge branch 'center-related-merge-request-items-horizontally' into 'master'Filipa Lacerda2017-05-101-1/+16
* | Merge branch '31274-creating-schedule-trigger--causes-http-500-when-accessing...Rémy Coutable2017-05-105-11/+150
* | Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-103-1/+16
* | Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master'Douwe Maan2017-05-104-11/+45
* | Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into 'm...Sean McGivern2017-05-104-5/+58
* | Merge branch 'merge-request-poll-json-endpoint' into 'master' Filipa Lacerda2017-05-102-1/+5
* | Merge branch 'fix-search-not-highlighting' into 'master'Filipa Lacerda2017-05-103-5/+34
* | Update CHANGELOG.md for 9.1.3v9.1.3Lin Jen-Shin2017-05-051-0/+1
* | Update CHANGELOG.md for 9.1.3Lin Jen-Shin2017-05-052-4/+1
* | Merge remote-tracking branch 'dev/9-1-stable' into 9-1-stableLin Jen-Shin2017-05-0510-33/+12
|\ \
| * | Update VERSION to 9.1.3Lin Jen-Shin2017-05-051-1/+1
| * | Update CHANGELOG.md for 9.1.3Lin Jen-Shin2017-05-059-32/+11
* | | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-048-19/+105
|/ /
* | Fix the other failureLin Jen-Shin2017-05-041-1/+1
* | Fix test errorLin Jen-Shin2017-05-041-1/+1
* | Fix test failureLin Jen-Shin2017-05-041-1/+1
* | Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-045-3/+29
* | Merge branch 'snippets-finder-visibility' into 'security' Douwe Maan2017-05-0423-186/+389
* | Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-043-7/+19
* | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-043-3/+80
* | Merge branch 'snippets_visibility' into 'security' Sean McGivern2017-05-044-215/+161
* | Merge branch 'droplab-templating-xss-fix' into 'master'Jacob Schatz2017-05-046-12/+21
* | Merge branch 'rs-sanitize-submodule-urls' into 'security' Douwe Maan2017-05-043-16/+46