summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 9.3.11v9.3.119-3-stableJose Ivan Vargas2017-09-061-1/+1
* Update CHANGELOG.md for 9.3.11Jose Ivan Vargas2017-09-0616-63/+18
* Merge branch 'fix-comment-reflection-9-3' into 'security-9-3'Jacob Schatz2017-09-062-20/+37
|\
| * fix indentation and readd missing tagSimon Knox2017-09-061-8/+9
| * fix 9.3 conflictsSimon Knox2017-09-061-39/+34
| * 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-2/+5
| * Fixed Test for Notes SpecTim Zallmann2017-09-051-3/+2
| * Fixes vulnerability in posting a comment in the temporary renderingTim Zallmann2017-09-052-27/+46
* | Merge branch 'rs-issue-29992-9-3' into 'security-9-3'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-3' into 'security-9-3'Robert Speicher2017-09-063-3/+30
|\ \
| * | Unmark the commit author/committer link as HTML-safeTim Zallmann2017-09-053-3/+30
| |/
* | fix lint - remove unused variableSimon Knox2017-09-061-2/+2
* | Removes extra line added in a backportFilipa Lacerda2017-09-061-2/+0
|/
* Merge branch 'rs-issue-36098-9-3' into 'security-9-3'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-3' into 'security-9-3'Douwe Maan2017-08-3120-33/+161
|\ \
| * | Fix specsGabriel Mazetto2017-08-301-22/+0
| * | fix transient test failures caused by wrong dropdown triggerSimon Knox2017-08-303-5/+3
| * | Fix wiki_formatter_specGabriel Mazetto2017-08-301-2/+2
| * | Fix specsDouwe Maan2017-08-303-3/+2
| * | 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-19/+174
* | | Merge branch 'rs-issue-36104-9-3' into 'security-9-3'Douwe Maan2017-08-308-8/+23
|\ \ \
| * | | Disallow the `name` attribute on all user-provided markupRobert Speicher2017-08-238-8/+23
| | |/ | |/|
* | | Add namespace argument to `namespace_project_environments_path` helperRobert Speicher2017-08-292-2/+2
* | | Merge branch 'fix-user-select-dropdown-escaping' into 'security-9-5'Clement Ho2017-08-291-6/+6
* | | Fixed environments pathsJose Ivan Vargas2017-08-292-2/+2
* | | Merge branch 'race-condition-in-project-uploads-fix-9-4' into 'security-9-4'Sean McGivern2017-08-291-0/+4
* | | Revert "Merge branch 'race-condition-in-project-uploads-fix-9-4' into 'securi...Simon Knox2017-08-291-4/+0
* | | Merge branch 'race-condition-in-project-uploads-fix-9-4' into 'security-9-4'Sean McGivern2017-08-291-0/+4
* | | resolve conflicts from 5dc5846ec9749451039c4572b98908443f989cf6Simon Knox2017-08-292-47/+0
* | | Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-08-299-109/+193
* | | Merge branch 'update-pages-9-3' into 'security-9-3'Douwe Maan2017-08-241-1/+1
|\ \ \
| * | | Update GitLab PagesNick Thomas2017-08-081-1/+1
* | | | Merge remote-tracking branch 'dev/9-3-stable' into security-9-3Gabriel Mazetto2017-08-238-1/+58
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Add missing guidelines for i18n setupRubén Dávila2017-08-141-0/+5
| * | Merge branch '9-3-stable' of https://gitlab.com/gitlab-org/gitlab-ce into 9-3...James Edwards-Jones2017-08-105-0/+43
| |\ \
| | * \ Merge branch '35342-re2-in-upgrade-docs-9-3' into '9-3-stable'Rémy Coutable2017-08-105-0/+43
| | |\ \
| | | * | Include RE2 in the upgrade docsNick Thomas2017-08-105-0/+43
| * | | | Update VERSION to 9.3.10v9.3.10James Edwards-Jones2017-08-091-1/+1
| * | | | Update CHANGELOG.md for 9.3.10James Edwards-Jones2017-08-093-9/+5
| * | | | Merge branch '9-3-stable-fix-cache' into '9-3-stable'Mike Greiling2017-08-081-0/+4
| |/ / /
| * | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-083-1/+14
| * | | Merge branch 'rs-alphanumeric-ssh-params-9-3' into 'security-9-3'James Edwards-Jones2017-08-083-0/+47
| |/ /
* | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-083-1/+14
|\ \ \
| * | | Merge branch 'fix/import-symbolink-links' into 'security-9-4'Rémy Coutable2017-08-083-1/+14
| | |/ | |/|