diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-06-10 08:56:25 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-06-10 08:56:25 +0100 |
| commit | 51713627f61b5897c0697f7574d8c3d7c3e93c41 (patch) | |
| tree | 21cf681e4c976bd2012af21ba749f952624de9b5 /app/models/concerns/referable.rb | |
| parent | 6a4aa3f9be8b31e5d76750d40f15f5fef2c792af (diff) | |
| parent | e3072811475dcd563911a78fce85263b693d3fd6 (diff) | |
| download | gitlab-ce-51713627f61b5897c0697f7574d8c3d7c3e93c41.tar.gz | |
Merge remote-tracking branch 'origin/master' into patch-56
Diffstat (limited to 'app/models/concerns/referable.rb')
| -rw-r--r-- | app/models/concerns/referable.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/referable.rb b/app/models/concerns/referable.rb index 58143a32fdc..4a506146de3 100644 --- a/app/models/concerns/referable.rb +++ b/app/models/concerns/referable.rb @@ -73,6 +73,7 @@ module Referable (?<url> #{Regexp.escape(Gitlab.config.gitlab.url)} \/#{Project.reference_pattern} + (?:\/\-)? \/#{Regexp.escape(route)} \/#{pattern} (?<path> |