diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 15:09:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 15:09:52 +0300 |
commit | 8ae26d705abe341b03bc15d4373d6cd0c77c0baf (patch) | |
tree | 655ee03a968e340c975b8ab7d77cfd5ceaf3c969 /lib/gitlab/repo_path.rb | |
parent | fc1df8c8307fc5022f9e8aae04164c089d8fdf2e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/repo_path.rb')
-rw-r--r-- | lib/gitlab/repo_path.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/gitlab/repo_path.rb b/lib/gitlab/repo_path.rb index da74c38d0ec..67e23624045 100644 --- a/lib/gitlab/repo_path.rb +++ b/lib/gitlab/repo_path.rb @@ -19,8 +19,7 @@ module Gitlab # Removing the suffix (.wiki, .design, ...) from the project path full_path = repo_path.chomp(type.path_suffix) - container, project, was_redirected = find_container(type, full_path) - redirected_path = repo_path if was_redirected + container, project, redirected_path = find_container(type, full_path) return [container, project, type, redirected_path] if container end @@ -33,22 +32,23 @@ module Gitlab def self.find_container(type, full_path) if type.snippet? - snippet, was_redirected = find_snippet(full_path) + snippet, redirected_path = find_snippet(full_path) - [snippet, snippet&.project, was_redirected] + [snippet, snippet&.project, redirected_path] else - project, was_redirected = find_project(full_path) + project, redirected_path = find_project(full_path) - [project, project, was_redirected] + [project, project, redirected_path] end end def self.find_project(project_path) - return [nil, false] if project_path.blank? + return [nil, nil] if project_path.blank? project = Project.find_by_full_path(project_path, follow_redirects: true) + redirected_path = redirected?(project, project_path) ? project_path : nil - [project, redirected?(project, project_path)] + [project, redirected_path] end def self.redirected?(project, project_path) @@ -59,12 +59,12 @@ module Gitlab # - snippets/1 # - h5bp/html5-boilerplate/snippets/53 def self.find_snippet(snippet_path) - return [nil, false] if snippet_path.blank? + return [nil, nil] if snippet_path.blank? snippet_id, project_path = extract_snippet_info(snippet_path) - project, was_redirected = find_project(project_path) + project, redirected_path = find_project(project_path) - [Snippet.find_by_id_and_project(id: snippet_id, project: project), was_redirected] + [Snippet.find_by_id_and_project(id: snippet_id, project: project), redirected_path] end def self.extract_snippet_info(snippet_path) |