Commit dc5bd10d45481268f00c8cc9f8500d29d392e07f
Exists in
spb-stable
and in
3 other branches
Merge pull request #5922 from jhollingsworth/fix/rake-routes
Fixed issue with `bundle exec rake routes` not running.
Showing
1 changed file
with
11 additions
and
11 deletions
Show diff stats
lib/gitlab/regex.rb
| @@ -24,20 +24,20 @@ module Gitlab | @@ -24,20 +24,20 @@ module Gitlab | ||
| 24 | 24 | ||
| 25 | %r{ | 25 | %r{ |
| 26 | (?! | 26 | (?! |
| 27 | - # doesn't begins with | ||
| 28 | - \/| # (rule #6) | ||
| 29 | - # doesn't contain | 27 | + (?# doesn't begins with) |
| 28 | + \/| (?# rule #6) | ||
| 29 | + (?# doesn't contain) | ||
| 30 | .*(?: | 30 | .*(?: |
| 31 | - [\/.]\.| # (rule #1,3) | ||
| 32 | - \/\/| # (rule #6) | ||
| 33 | - @\{| # (rule #8) | ||
| 34 | - \\ # (rule #9) | 31 | + [\/.]\.| (?# rule #1,3) |
| 32 | + \/\/| (?# rule #6) | ||
| 33 | + @\{| (?# rule #8) | ||
| 34 | + \\ (?# rule #9) | ||
| 35 | ) | 35 | ) |
| 36 | ) | 36 | ) |
| 37 | - [^\000-\040\177~^:?*\[]+ # (rule #4-5) | ||
| 38 | - # doesn't end with | ||
| 39 | - (?<!\.lock) # (rule #1) | ||
| 40 | - (?<![\/.]) # (rule #6-7) | 37 | + [^\000-\040\177~^:?*\[]+ (?# rule #4-5) |
| 38 | + (?# doesn't end with) | ||
| 39 | + (?<!\.lock) (?# rule #1) | ||
| 40 | + (?<![\/.]) (?# rule #6-7) | ||
| 41 | }x | 41 | }x |
| 42 | end | 42 | end |
| 43 | 43 |