diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-01 15:09:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-01 15:09:17 +0300 |
commit | 7b2635a55d4e87431bae752bd44c6fd2d2657b03 (patch) | |
tree | 88182aabb51a167e10f6c3a6d404b2247613047f /lib/gitlab/path_regex.rb | |
parent | a7704bf16a51a8c993215a69db17232e3f246b8e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/path_regex.rb')
-rw-r--r-- | lib/gitlab/path_regex.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index ad0a5c80604..2ff23980ebd 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -180,12 +180,16 @@ module Gitlab end end - def project_git_route_regex - @project_git_route_regex ||= /#{project_route_regex}\.git/.freeze + def repository_route_regex + @repository_route_regex ||= /#{full_namespace_route_regex}|#{personal_snippet_repository_path_regex}/.freeze end - def project_wiki_git_route_regex - @project_wiki_git_route_regex ||= /#{PATH_REGEX_STR}\.wiki/.freeze + def repository_git_route_regex + @repository_git_route_regex ||= /#{repository_route_regex}\.git/.freeze + end + + def repository_wiki_git_route_regex + @repository_wiki_git_route_regex ||= /#{full_namespace_route_regex}\.wiki\.git/.freeze end def full_namespace_path_regex @@ -250,10 +254,6 @@ module Gitlab %r{\A(#{personal_snippet_repository_path_regex}|#{project_snippet_repository_path_regex})\z} end - def personal_and_project_snippets_path_regex - %r{#{personal_snippet_path_regex}|#{project_snippet_path_regex}} - end - def container_image_regex @container_image_regex ||= %r{([\w\.-]+\/){0,1}[\w\.-]+}.freeze end |