From 33fdf1a91d0f9588fd08d2f11ff6eb78425712c0 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 07 2019 05:45:32 +0000
Subject: add resolve, resolves, resolved as keywords for fixing issues


this adds resolve as a keyword for fixing issues when put in
commit messages.

fixes #4039

---

diff --git a/pagure/lib/link.py b/pagure/lib/link.py
index c64fe82..5cc7ecd 100644
--- a/pagure/lib/link.py
+++ b/pagure/lib/link.py
@@ -21,7 +21,7 @@ from pagure.config import config as pagure_config
 
 FIXES = [
     re.compile(r"(?:.*\s+)?{0}?[sd]?:?\s*?#(\d+)".format(kw), re.I)
-    for kw in ["fixe", "merge", "close"]
+    for kw in ["fixe", "merge", "close", "resolve"]
 ]
 FIXES += [
     re.compile(
@@ -31,7 +31,7 @@ FIXES += [
         ),
         re.I,
     )
-    for kw in ["fixe", "merge", "close"]
+    for kw in ["fixe", "merge", "close", "resolve"]
 ]
 
 
diff --git a/tests/test_pagure_lib_link.py b/tests/test_pagure_lib_link.py
index 901cfe6..2bbae2d 100644
--- a/tests/test_pagure_lib_link.py
+++ b/tests/test_pagure_lib_link.py
@@ -294,6 +294,13 @@ class PagureLibLinktests(tests.Modeltests):
         issue_match('Merge #137', '137')
         issue_match('Merges #137', '137')
         issue_match('Merges: #137', '137')
+        issue_match('Resolves: #137', '137')
+        issue_match('Resolved: #138', '138')
+        issue_match('Resolve: #138', '139')
+        issue_match('Resolves #137', '137')
+        issue_match('Resolved #138', '138')
+        issue_match('Resolve #138', '139')
+
 
         # no match
         def no_match(text):