diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-05-15 16:10:55 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-05-26 15:49:22 -0400 |
| commit | 1a9da9178cfd25190997b621e428a5c7ce467cd1 (patch) | |
| tree | a5edb5df2ba7d76e9fdc29e7eb7615e60fbb404a /app/models/merge_request.rb | |
| parent | 5cc9b17b8a7d7a8081fa60ea75f6cf423fbddbc5 (diff) | |
| download | gitlab-ce-1a9da9178cfd25190997b621e428a5c7ce467cd1.tar.gz | |
Surround Project.reference_pattern in parenthesis inside other patterns
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6c90d09b866..c57016dd6a2 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -145,7 +145,7 @@ class MergeRequest < ActiveRecord::Base # This pattern supports cross-project references. def self.reference_pattern %r{ - #{Project.reference_pattern}? + (#{Project.reference_pattern})? #{Regexp.escape(reference_prefix)}(?<merge_request>\d+) }x end |