diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /lib/gitlab/path_regex.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
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 |