commit b9034ee3ec2f1ed4f02f9122a8d9f1baaa9e9ff1
author Luca Milanesio <luca.milanesio@gmail.com> Mon Mar 20 07:44:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 20 07:44:42 2017 +0000
tree cc2c32054e54209e10600e2b21c41fdb0e57164b
parent 0eecd72cac410f55bca66dac709fc73c6078a58f
parent f99897af653fdab2ab8157b61678c6b9e75c1b06

Merge "Merge branch 'stable-2.13'"

src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
index 38c4fe5..e0c8bea 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
@@ -104,7 +104,10 @@
     jiraComment.string("Jira issue-Id regex", "match", "([A-Z]+-[0-9]+)");
     jiraComment.set("html",
         String.format("<a href=\"%s/browse/$1\">$1</a>", jiraUrl));
-    jiraComment.select("Issue-id enforced in commit message", "association",
+
+    Section pluginConfig = sections.get("plugin", pluginName);
+
+    pluginConfig.select("Issue-id enforced in commit message", "association",
         ItsAssociationPolicy.SUGGESTED);
   }
 

src/main/resources/Documentation/config.md

diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index c6f2e5f..3eff578 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -77,7 +77,7 @@
 Example:
 
     [commentLink "its-jira"]
-    match = (\\[[A-Z][A-Z]+-[1-9][0-9]*\\])
+    match = ([A-Z]+-[0-9]+)
     html = "<a href=\"http://jira.example.com/browse/$1\">$1</a>"
     association = SUGGESTED