diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /lib/gitlab/repo_path.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'lib/gitlab/repo_path.rb')
-rw-r--r-- | lib/gitlab/repo_path.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/gitlab/repo_path.rb b/lib/gitlab/repo_path.rb index 67e23624045..9ee6f67e455 100644 --- a/lib/gitlab/repo_path.rb +++ b/lib/gitlab/repo_path.rb @@ -35,6 +35,10 @@ module Gitlab snippet, redirected_path = find_snippet(full_path) [snippet, snippet&.project, redirected_path] + elsif type.wiki? + wiki, redirected_path = find_wiki(full_path) + + [wiki, wiki.try(:project), redirected_path] else project, redirected_path = find_project(full_path) @@ -67,6 +71,17 @@ module Gitlab [Snippet.find_by_id_and_project(id: snippet_id, project: project), redirected_path] end + # Wiki path can be either: + # - namespace/project + # - group/subgroup/project + def self.find_wiki(wiki_path) + return [nil, nil] if wiki_path.blank? + + project, redirected_path = find_project(wiki_path) + + [project&.wiki, redirected_path] + end + def self.extract_snippet_info(snippet_path) path_segments = snippet_path.split('/') snippet_id = path_segments.pop |