Merge remote-tracking branch 'origin/master' into production

This commit is contained in:
Dan Hawkins 2018-10-22 12:44:14 +01:00
commit 466ae2a1c9

View file

@ -78,6 +78,9 @@ jiraprojectpattern = {
'SMB': ( re.compile("^.* +(?:[Ss][Mm][Bb][ _-]*|\#\s*)(\d+):*(.*)$"),
re.compile('^(\S*) Revert " *SMB-(\d+):* (.*)"$'),
),
'HMBFDHV': ( re.compile("^.* +(?:[Hh][Mm][Bb][Ff][Dd][Hh][Vv][ _-]*|\#\s*)(\d+):*(.*)$"),
re.compile('^(\S*) Revert " *HMBFDHV-(\d+):* (.*)"$'),
),
}
mergepattern = re.compile("^(.*)((?:Merge branch '.*'|Merge remote-tracking branch '.*'|Merge commit '.*'|Add '.*' from commit).*)$")