summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 9.4.7v9.4.7release-tools-create-branch9-4-stable-patch-999-4-stable-patch-19-4-stableJarka Kadlecova2017-10-161-1/+1
* Update CHANGELOG.md for 9.4.7Jarka Kadlecova2017-10-167-29/+9
* Merge branch '3435-backport-9-4' into 'security-9-4'Stan Hu2017-10-154-23/+2
* Merge branch 'winh-upgrade-nokogiri' into 'master'Robert Speicher2017-10-122-5/+5
* Upgrade mail and nokogiri gems due to security issuesMarkus Koller2017-10-122-4/+9
* Merge branch '38126-security-username-change-9-4' into 'security-9-4'Douwe Maan2017-10-124-12/+49
* Merge branch 'winh-search-bar-xss-9.4' into 'security-9-4'Phil Hughes2017-10-123-2/+29
* Merge branch 'rs-sanitize-unicode-in-protocol-9-4' into 'security-9-4'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.4.6v9.4.6Jose Ivan Vargas2017-09-061-1/+1
* Update CHANGELOG.md for 9.4.6Jose Ivan Vargas2017-09-0610-39/+12
* Merge branch 'fix-comment-reflection-9-4' into 'security-9-4'Jacob Schatz2017-09-062-5/+22
|\
| * Added missing at signJose Ivan Vargas2017-09-051-3/+3
| * Resetting the value just to be sure afterwards again through .text()Tim Zallmann2017-09-051-0/+3
| * Fixed Test for Notes SpecTim Zallmann2017-09-051-3/+2
| * Fixes vulnerability in posting a comment in the temporary renderingTim Zallmann2017-09-052-5/+20
* | Merge branch 'rs-issue-29992-9-4' into 'security-9-4'Robert Speicher2017-09-064-28/+31
|\ \
| * | Merge branch 'fix/gem-security-updates' into 'master'Robert Speicher2017-08-314-28/+31
| |/
* | Merge branch 'rs-commit-block-xss-9-4' into 'security-9-4'Robert Speicher2017-09-063-3/+30
|\ \ | |/ |/|
| * Unmark the commit author/committer link as HTML-safeTim Zallmann2017-09-053-3/+30
|/
* Merge branch 'rs-issue-36098-9-4' into 'security-9-4'Robert Speicher2017-08-313-4/+42
|\
| * Limit `style` attribute on `th` and `td` elements to specific propertiesRobert Speicher2017-08-143-4/+42
* | Merge branch '36743-existing-repo-9-4' into 'security-9-4'Douwe Maan2017-08-3117-25/+143
|\ \
| * | Fix wiki_formatter_specGabriel Mazetto2017-08-291-2/+2
| * | Fix specsDouwe Maan2017-08-292-3/+1
| * | Fix seed_fu for MySQLGabriel Mazetto2017-08-281-2/+1
| * | Fix import_file_specGabriel Mazetto2017-08-281-0/+1
| * | Fix seed_fuGabriel Mazetto2017-08-282-4/+2
| * | Prevent new / renamed project from using a repository path that already exist...Gabriel Mazetto2017-08-2814-16/+138
* | | Merge branch 'rs-issue-36104-9-4' into 'security-9-4'Douwe Maan2017-08-308-8/+23
|\ \ \
| * | | Disallow the `name` attribute on all user-provided markupRobert Speicher2017-08-238-8/+23
| | |/ | |/|
* | | Merge branch 'fix-user-select-dropdown-escaping' into 'security-9-5'Clement Ho2017-08-291-6/+6
* | | Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-08-299-125/+162
* | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-08-293-11/+44
* | | Merge branch 'update-pages-9-4' into 'security-9-4'Douwe Maan2017-08-241-1/+1
|\ \ \
| * | | Update GitLab Pages to v0.5.1Nick Thomas2017-08-081-1/+1
* | | | Merge remote-tracking branch 'dev/9-4-stable' into security-9-4Gabriel Mazetto2017-08-23515-1817/+9004
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge branch '9-4-add-missing-i18n-guidelines' into '9-4-stable'Rémy Coutable2017-08-161-0/+5
| |\ \
| | * | Add missing guidelines for i18n setup9-4-add-missing-i18n-guidelinesRubén Dávila2017-08-141-0/+5
| |/ /
| * | Update VERSION to 9.4.5v9.4.5James Edwards-Jones2017-08-141-1/+1
| * | Update CHANGELOG.md for 9.4.5James Edwards-Jones2017-08-1419-73/+21
| * | Fix spec failures in 9-4-stable-patch-59-4-stable-patch-5James Edwards-Jones2017-08-113-4/+4
| * | Merge branch 'fix-jenkins-error' into '9-4-stable-patch-5'James Edwards-Jones2017-08-112-3/+3
| |\ \
| | * | Fix displaying specific error message when Jenkins test failsfix-jenkins-errorJarka Kadlecova2017-08-112-3/+3
| * | | Merge branch '35131-do-not-run-ee_compat_check-for-stableish-branches' into '...Rémy Coutable2017-08-111-1/+1
| * | | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'Sean McGivern2017-08-114-27/+73
| * | | Merge branch '36158-new-issue-button' into 'master'Phil Hughes2017-08-113-3/+7
| * | | Merge branch '35342-re2-in-upgrade-docs' into 'master'Rémy Coutable2017-08-116-0/+53
| * | | Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace...Filipa Lacerda2017-08-117-4/+84