From 1bc913663ee417e23b4bcf8d3cb8e787690436cc Mon Sep 17 00:00:00 2001 From: Mikhail Voronyuk Date: Wed, 29 Apr 2015 03:31:59 +0300 Subject: [PATCH] fixed a bug: if there are no fix keywords there will be an error. Now repository's commits can be parsed --- plugins/issue_id/lib/issue_changeset_patch.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/issue_id/lib/issue_changeset_patch.rb b/plugins/issue_id/lib/issue_changeset_patch.rb index 0d9aa7d..bd6846a 100644 --- a/plugins/issue_id/lib/issue_changeset_patch.rb +++ b/plugins/issue_id/lib/issue_changeset_patch.rb @@ -39,7 +39,7 @@ module IssueChangesetPatch return if comments.blank? ref_keywords = Setting.commit_ref_keywords.downcase.split(',').collect(&:strip) ref_keywords_any = ref_keywords.delete('*') - fix_keywords = Setting.commit_fix_keywords.downcase.split(',').collect(&:strip) + fix_keywords = Setting.commit_update_keywords_array.map {|r| r['keywords']}.flatten.compact # as in redmine 2.5.1 kw_regexp = (ref_keywords + fix_keywords).collect{ |kw| Regexp.escape(kw) }.join('|') referenced_issues = [] -- 1.9.5 (Apple Git-50.3)