Merge branch 'stable-2.13'
* stable-2.13:
Fix jira regex
Use correct plugin config for association policy
Change-Id: I510958c5e4702b1b4861285dd5fe74286576a9ce
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);
}
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
