Add support for fixing keywords

Author: sandratatarevicova

README.md

@@ -44,7 +44,8 @@ authenticate webhooks.
 Optionally, you can also set the following variables:
 
 * `REDMINE_MERGE_REQUEST_LINKS_AFTER_MERGE_STATUS` - Name of issue status which should be set after the merge request is merged.
-* `REDMINE_MERGE_REQUEST_LINKS_GITLAB_REDMINE_USER_ID` - ID of Redmine user who should change the status - used as journal author.
+* `REDMINE_MERGE_REQUEST_LINKS_REDMINE_USER_ID` - ID of Redmine user who should change the status - used as journal author.
+* `REDMINE_MERGE_REQUEST_LINKS_FIXING_KEYWORD_PATTERN` - Fixing keyword pattern. When set, the issue status is changed only when issue ID is preceeded with the fixing pattern. Example pattern: `(?:clos(?:e[sd]?|ing)|fix(?:e[sd]|ing)?|resolv(?:e[sd]?|ing))`
 
 Export the environment variable(s) in your bash or webserver config.
 Examples with Phusion Passenger webserver can be found here:

app/models/merge_request.rb

@@ -32,15 +32,22 @@ def mentioned_issue_ids
     end.uniq
   end
 
+  def fixed_issue_ids(fixing_pattern)
+    fixed_issue_regexp = fixing_pattern + ISSUE_ID_REGEXP.source
+    [description, title].flat_map do |value|
+      (value || '').scan(/#{fixed_issue_regexp}/i)
+    end.uniq
+  end
+
   def update_mentioned_issues_status
-    redmine_user_id = ENV['REDMINE_MERGE_REQUEST_LINKS_GITLAB_REDMINE_USER_ID']
+    redmine_user_id = ENV['REDMINE_MERGE_REQUEST_LINKS_REDMINE_USER_ID']
     after_merge_status = ENV['REDMINE_MERGE_REQUEST_LINKS_AFTER_MERGE_STATUS']
-
+    fixing_pattern = ENV['REDMINE_MERGE_REQUEST_LINKS_FIXING_KEYWORD_PATTERN']
     if state != 'merged' || redmine_user_id.blank? || after_merge_status.blank?
       return
     end
-
-    mentioned_issue_ids.map do |match|
+    issue_ids = fixing_pattern.present? ? fixed_issue_ids(fixing_pattern) : mentioned_issue_ids
+    issue_ids.map do |match|
       issue = Issue.find_by_id(match[0])
       if issue.present?
         issue.init_journal(User.find(redmine_user_id))