Match Gerrit changeid after all other commentlinks
* modules/openstack_project/manifests/gerrit.pp: The changeid commentlink is greedy, so check it only after the other more specific commentlinks. Change-Id: I968d3cbaae94e46ee81c32a9f6f9fdac566d7d40
This commit is contained in:
parent
8e9eb4aace
commit
460e321661
@ -126,11 +126,6 @@ class openstack_project::gerrit (
|
|||||||
httpd_maxthreads => $httpd_maxthreads,
|
httpd_maxthreads => $httpd_maxthreads,
|
||||||
httpd_maxwait => $httpd_maxwait,
|
httpd_maxwait => $httpd_maxwait,
|
||||||
commentlinks => [
|
commentlinks => [
|
||||||
{
|
|
||||||
name => 'changeid',
|
|
||||||
match => '(<p>|[\\s]+)(I?[0-9a-f]{7,40})(</p>|[\\s.]+)',
|
|
||||||
html => '$1<a href=\"#q,$2,n,z\">$2</a>$3',
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name => 'bugheader',
|
name => 'bugheader',
|
||||||
match => '([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\s*#?(\\d+)',
|
match => '([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\s*#?(\\d+)',
|
||||||
@ -155,7 +150,12 @@ class openstack_project::gerrit (
|
|||||||
name => 'launchpadbug',
|
name => 'launchpadbug',
|
||||||
match => '<a href=\"(https://bugs\\.launchpad\\.net/[a-zA-Z0-9\\-]+/\\+bug/(\\d+))[^\"]+\">[^<]+</a>',
|
match => '<a href=\"(https://bugs\\.launchpad\\.net/[a-zA-Z0-9\\-]+/\\+bug/(\\d+))[^\"]+\">[^<]+</a>',
|
||||||
html => '<a href=\"$1\">$1</a>'
|
html => '<a href=\"$1\">$1</a>'
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
name => 'changeid',
|
||||||
|
match => '(<p>|[\\s]+)(I?[0-9a-f]{7,40})(</p>|[\\s.]+)',
|
||||||
|
html => '$1<a href=\"#q,$2,n,z\">$2</a>$3',
|
||||||
|
},
|
||||||
],
|
],
|
||||||
war => $war,
|
war => $war,
|
||||||
contactstore => $contactstore,
|
contactstore => $contactstore,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user