Commit 917a112e authored by Stan Hu's avatar Stan Hu

Simplify normalizing of paths

parent e8cced80
...@@ -7,6 +7,8 @@ module Gitlab ...@@ -7,6 +7,8 @@ module Gitlab
@root_path = root_path @root_path = root_path
@repo_path = repo_path @repo_path = repo_path
@root_path << '/' unless root_path.ends_with?('/')
# Split path into 'all/the/namespaces' and 'project_name' # Split path into 'all/the/namespaces' and 'project_name'
@group_path, _, @project_name = repo_relative_path.rpartition('/') @group_path, _, @project_name = repo_relative_path.rpartition('/')
end end
...@@ -34,11 +36,8 @@ module Gitlab ...@@ -34,11 +36,8 @@ module Gitlab
private private
def repo_relative_path def repo_relative_path
absolute_path = Pathname.new(repo_path)
project_root = Pathname.new(@root_path)
# Remove root path and `.git` at the end # Remove root path and `.git` at the end
absolute_path.relative_path_from(project_root).to_s.gsub(/\.git$/, '') repo_path[@root_path.size...-4]
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment