diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index 713a9b5af9d20e479e2f37f4b7fb40a8319820d0..8894a01eaeabd1041083074a7d9ed7c907bed934 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -145,16 +145,20 @@ module GitlabMarkdownHelper end end - def file_exists?(document_path) - return false if document_path.nil? || document_path.empty? - full_path = [@path_to_satellite, document_path].join("/") - File.exists?(full_path) + def file_exists?(path) + return false if path.nil? || path.empty? + File.exists?(path_on_fs(path)) end # Check if the path is pointing to a directory(tree) or a file(blob) # eg. doc/api is directory and doc/README.md is file def local_path(path) - File.directory?(Rails.root.join(path)) ? "tree" : "blob" + File.directory?(path_on_fs(path)) ? "tree" : "blob" + end + + # Path to the file in the satellites repository on the filesystem + def path_on_fs(path) + [@path_to_satellite, path].join("/") end # We will assume that if no ref exists we can point to master