summaryrefslogtreecommitdiff
path: root/GITLAB_SHELL_VERSION
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-08 16:30:23 +0000
committerDouwe Maan <douwe@gitlab.com>2015-04-08 16:30:23 +0000
commitf3f856029bc5f966c5a7ee24cf7efefdd20e6019 (patch)
tree34440f1113b7d3acd005bafbcd67d4e2dbf09f28 /GITLAB_SHELL_VERSION
parenta381ecbdbc3dbdbe7a0056cebc5cbf905af8e69c (diff)
parent3143edfea6b71a6a26470e3f4a9cffa773f584ec (diff)
downloadgitlab-ce-f3f856029bc5f966c5a7ee24cf7efefdd20e6019.tar.gz
Merge branch 'fix-slashes-in-wiki-urls' into 'master'
Fix bug where Wiki pages that include a '/' were no longer accessible ### What does this MR do? This MR fixes a regression that caused Wiki pages that included a '/' to no longer be accessible. ### Are there points in the code the reviewer needs to double check? Are there cases that `wiki_helper.rb` doesn't handle? ### Why was this MR needed? The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a model ID to be escaped automatically. We can no longer use the built-in the URL helpers to generate the links for Wiki pages if we want to maintain support for slashes. There is no option to tell the formatter otherwise: http://stackoverflow.com/questions/25031791/rails-4-1-2-to-param-escapes-slashes-and-breaks-app The Rails code in question is here: https://github.com/rails/rails/blob/4-1-stable/actionpack/lib/action_dispatch/journey/visitors.rb#L159 ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1363 See merge request !502
Diffstat (limited to 'GITLAB_SHELL_VERSION')
0 files changed, 0 insertions, 0 deletions