Download as
Browse Code »

Commit 603e04bc21b07b8b6f70e972383ea2f29d0bfce0

Authored by Marin Jankovski
1 parent 52c3179b
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Make sure slashes are handled properly.

Showing 1 changed file with 8 additions and 0 deletions   Show diff stats
app/helpers/gitlab_markdown_helper.rb
  Diff comments   View file @603e04b
@@ -102,6 +102,8 @@ module GitlabMarkdownHelper @@ -102,6 +102,8 @@ module GitlabMarkdownHelper
102 path.gsub!(/(#.*)/, "") 102 path.gsub!(/(#.*)/, "")
103 id = $1 || "" 103 id = $1 || ""
104 file_path = relative_file_path(path) 104 file_path = relative_file_path(path)
  105 + file_path = sanitize_slashes(file_path)
  106 +
105 [ 107 [
106 Gitlab.config.gitlab.relative_url_root, 108 Gitlab.config.gitlab.relative_url_root,
107 @project.path_with_namespace, 109 @project.path_with_namespace,
@@ -110,6 +112,12 @@ module GitlabMarkdownHelper @@ -110,6 +112,12 @@ module GitlabMarkdownHelper
110 ].compact.join("/").gsub(/^\/*|\/*$/, '') + id 112 ].compact.join("/").gsub(/^\/*|\/*$/, '') + id
111 end 113 end
112 114
  115 + def sanitize_slashes(path)
  116 + path[0] = "" if path.start_with?("/")
  117 + path.chop if path.end_with?("/")
  118 + path
  119 + end
  120 +
113 def relative_file_path(path) 121 def relative_file_path(path)
114 requested_path = @path 122 requested_path = @path
115 nested_path = build_nested_path(path, requested_path) 123 nested_path = build_nested_path(path, requested_path)