diff options
| author | winniehell <git@winniehell.de> | 2016-08-26 10:01:32 +0200 |
|---|---|---|
| committer | winniehell <git@winniehell.de> | 2016-10-24 22:18:34 +0200 |
| commit | ac2eb1cd012914b730911422e31410a78fe242b3 (patch) | |
| tree | 599917b366b92c6577664f9930a16074a4467a63 | |
| parent | a31a719a4fa29373fd39eab7b84ea4955121e9fd (diff) | |
| download | gitlab-ce-ac2eb1cd012914b730911422e31410a78fe242b3.tar.gz | |
Escape ref and path for relative links (!6050)
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/banzai/filter/relative_link_filter.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 86878e5af6c..8522f2adaf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix extra space on Build sidebar on Firefox !7060 - Fix HipChat notifications rendering (airatshigapov, eisnerd) - Add hover to trash icon in notes !7008 (blackst0ne) + - Escape ref and path for relative links !6050 (winniehell) - Simpler arguments passed to named_route on toggle_award_url helper method - Fix: Backup restore doesn't clear cache - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb index 4fa8d05481f..f09d78be0ce 100644 --- a/lib/banzai/filter/relative_link_filter.rb +++ b/lib/banzai/filter/relative_link_filter.rb @@ -52,8 +52,8 @@ module Banzai relative_url_root, context[:project].path_with_namespace, uri_type(file_path), - ref, - file_path + Addressable::URI.escape(ref), + Addressable::URI.escape(file_path) ].compact.join('/').squeeze('/').chomp('/') uri |