diff options
| author | winniehell <git@winniehell.de> | 2016-08-01 04:52:05 +0200 |
|---|---|---|
| committer | winniehell <git@winniehell.de> | 2016-08-02 03:52:24 +0200 |
| commit | 40da543f2fddefcdebf12e52425314355a16a57d (patch) | |
| tree | cb6faef381fa3b122452366a70e40b1306139605 | |
| parent | 701e5ccbe6018129130ee70a78f213c406c93fcf (diff) | |
| download | gitlab-ce-40da543f2fddefcdebf12e52425314355a16a57d.tar.gz | |
Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/banzai/filter/relative_link_filter.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4daf9cd9092..c099c63ce86 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.11.0 (unreleased) - Fix the title of the toggle dropdown button. !5515 (herminiotorres) - Improve diff performance by eliminating redundant checks for text blobs - Remove magic comments (`# encoding: UTF-8`) from Ruby files. !5456 (winniehell) + - Add support for relative links starting with ./ or / to RelativeLinkFilter (winniehell) - Fix CI status icon link underline (ClemMakesApps) - Cache the commit author in RequestStore to avoid extra lookups in PostReceive - Fix of 'Commits being passed to custom hooks are already reachable when using the UI' diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb index 337fb50317d..5b73fc8fcee 100644 --- a/lib/banzai/filter/relative_link_filter.rb +++ b/lib/banzai/filter/relative_link_filter.rb @@ -87,10 +87,13 @@ module Banzai def build_relative_path(path, request_path) return request_path if path.empty? return path unless request_path + return path[1..-1] if path.start_with?('/') parts = request_path.split('/') parts.pop if uri_type(request_path) != :tree + path.sub!(%r{^\./}, '') + while path.start_with?('../') parts.pop path.sub!('../', '') |