summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '9-1-stable' of https://gitlab.com/gitlab-org/gitlab-ce into 9-1...9-1-stableJames Edwards-Jones2017-08-103-0/+23
|\
| * Merge branch '35342-re2-in-upgrade-docs-9-1' into '9-1-stable'Rémy Coutable2017-08-103-0/+23
| |\
| | * Include RE2 in the upgrade docsNick Thomas2017-08-103-0/+23
| |/
* | Update VERSION to 9.1.10v9.1.10James Edwards-Jones2017-08-091-1/+1
* | Update CHANGELOG.md for 9.1.10James Edwards-Jones2017-08-093-9/+5
* | Merge branch '9-1-stable-fix-cache' into '9-1-stable'Mike Greiling2017-08-081-0/+4
* | Merge branch 'import-symlinks-9-1' into 'security-9-1'Mike Greiling2017-08-083-1/+14
* | Merge branch 'rs-alphanumeric-ssh-params-9-1' into 'security-9-1'Mike Greiling2017-08-083-0/+47
|/
* Merge branch 'fix-docs-re2-install' into 'master'Rémy Coutable2017-08-011-1/+1
* Update VERSION to 9.1.9v9.1.9James Edwards-Jones2017-07-201-1/+1
* Update CHANGELOG.md for 9.1.9James Edwards-Jones2017-07-202-4/+4
* Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-203-8/+45
* Update VERSION to 9.1.8v9.1.8James Edwards-Jones2017-07-191-1/+1
* Update CHANGELOG.md for 9.1.8James Edwards-Jones2017-07-195-16/+7
* Merge branch 'issue-title-leakage-9-1' into 'security-9-1'Sean McGivern2017-07-1921-124/+93
* Merge branch '24570-use-re2-for-user-supplied-regexp-9-1' into 'security-9-1'Douwe Maan2017-07-199-4/+174
* Merge branch '33303-9-1-security-fix' into 'security-9-1'Sean McGivern2017-07-193-0/+44
* Merge branch 'bvl-security-9-1-remove-appearance-symlink' into 'security-9-1'Douwe Maan2017-07-195-2/+105
* Merge branch 'fix-changelog-entry' into 'security-9-2'Sean McGivern2017-07-191-0/+0
* Merge branch 'security-9-1-backport-33323-fix-incorrect-project-authorization...Sean McGivern2017-07-194-3/+60
* Update VERSION to 9.1.7v9.1.7Regis2017-06-071-1/+1
* Update CHANGELOG.md for 9.1.7Regis2017-06-071-0/+4
* Merge branch 'bvl-fix-typo-renaming-appearance' into 'security-9-2'Douwe Maan2017-06-073-3/+59
* 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