From cd282b67fc467c740cd611bbb9bf8e264a194f39 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Apr 22 2016 12:01:27 +0000 Subject: Also accept Merges: as way to finish PRs Signed-off-by: Patrick Uiterwijk --- diff --git a/pagure/lib/link.py b/pagure/lib/link.py index 311c978..481818d 100644 --- a/pagure/lib/link.py +++ b/pagure/lib/link.py @@ -19,6 +19,10 @@ FIXES = [ re.compile(r'.*\s*fixe?[sd]?:?\s*?#(\d+)', re.I), re.compile(r'fixe?[sd]?:?\s*?https?://.*/(\w+)/issue/(\d+)', re.I), re.compile(r'.*\s*?fixe?[sd]?:?\s*?https?://.*/(\w+)/issue/(\d+)', re.I), + re.compile(r'merge?[sd]?:?\s*?#(\d+)', re.I), + re.compile(r'.*\s*merge?[sd]?:?\s*?#(\d+)', re.I), + re.compile(r'merge?[sd]?:?\s*?https?://.*/(\w+)/issue/(\d+)', re.I), + re.compile(r'.*\s*?merge?[sd]?:?\s*?https?://.*/(\w+)/issue/(\d+)', re.I), ] RELATES = [