diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-08 15:51:51 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-08 15:51:51 +0300 |
commit | 7be41074bb6596a41a5b6689ee98ab02cf4be50a (patch) | |
tree | 4353065dcd40dec5863f7ce6821fb30e435f1cdc /lib | |
parent | fa88474ab5bdd664bbc62b09ec3d049fb2af55bd (diff) | |
parent | 34962c7d0833f222aaaea9d6b042542801177699 (diff) |
Merge branch 'dz-refactor-namespace-regex' into 'master'
Refactor namespace regex
Reuse existing namespace regex constant in routing
See merge request !7336
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/regex.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb index 0d30e1bb92e..cb1659f9cee 100644 --- a/lib/gitlab/regex.rb +++ b/lib/gitlab/regex.rb @@ -8,6 +8,10 @@ module Gitlab @namespace_regex ||= /\A#{NAMESPACE_REGEX_STR}\z/.freeze end + def namespace_route_regex + @namespace_route_regex ||= /#{NAMESPACE_REGEX_STR}/.freeze + end + def namespace_regex_message "can contain only letters, digits, '_', '-' and '.'. " \ "Cannot start with '-' or end in '.', '.git' or '.atom'." \ |