Commit dc5bd10d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #5922 from jhollingsworth/fix/rake-routes

Fixed issue with `bundle exec rake routes` not running.
parents 055b3c4d 405492e9
...@@ -24,20 +24,20 @@ module Gitlab ...@@ -24,20 +24,20 @@ module Gitlab
%r{ %r{
(?! (?!
# doesn't begins with (?# doesn't begins with)
\/| # (rule #6) \/| (?# rule #6)
# doesn't contain (?# doesn't contain)
.*(?: .*(?:
[\/.]\.| # (rule #1,3) [\/.]\.| (?# rule #1,3)
\/\/| # (rule #6) \/\/| (?# rule #6)
@\{| # (rule #8) @\{| (?# rule #8)
\\ # (rule #9) \\ (?# rule #9)
) )
) )
[^\000-\040\177~^:?*\[]+ # (rule #4-5) [^\000-\040\177~^:?*\[]+ (?# rule #4-5)
# doesn't end with (?# doesn't end with)
(?<!\.lock) # (rule #1) (?<!\.lock) (?# rule #1)
(?<![\/.]) # (rule #6-7) (?<![\/.]) (?# rule #6-7)
}x }x
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment