From 799df9e8ccda83534628da6b1f63b9d455f0d5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=BCller?= Date: Mon, 5 Dec 2016 21:11:39 +0100 Subject: [PATCH] Convert the MR id to a String so MessageFormat won't format it like a number (Fixes #429) --- .../com/dabsquared/gitlabjenkins/cause/CauseData.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dabsquared/gitlabjenkins/cause/CauseData.java b/src/main/java/com/dabsquared/gitlabjenkins/cause/CauseData.java index 94d99bb..2e0ae64 100644 --- a/src/main/java/com/dabsquared/gitlabjenkins/cause/CauseData.java +++ b/src/main/java/com/dabsquared/gitlabjenkins/cause/CauseData.java @@ -348,11 +348,11 @@ public final class CauseData { String getShortDescription(CauseData data) { String forkNamespace = StringUtils.equals(data.getSourceNamespace(), data.getTargetBranch()) ? "" : data.getSourceNamespace() + "/"; if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) { - return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_plain(data.getMergeRequestIid(), + return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_plain(String.valueOf(data.getMergeRequestIid()), forkNamespace + data.getSourceBranch(), data.getTargetBranch()); } else { - return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_html(data.getMergeRequestIid(), + return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_html(String.valueOf(data.getMergeRequestIid()), forkNamespace + data.getSourceBranch(), data.getTargetBranch(), data.getTargetProjectUrl()); @@ -365,12 +365,12 @@ public final class CauseData { String forkNamespace = StringUtils.equals(data.getSourceNamespace(), data.getTargetBranch()) ? "" : data.getSourceNamespace() + "/"; if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) { return Messages.GitLabWebHookCause_ShortDescription_NoteHook_plain(triggeredBy, - data.getMergeRequestIid(), + String.valueOf(data.getMergeRequestIid()), forkNamespace + data.getSourceBranch(), data.getTargetBranch()); } else { return Messages.GitLabWebHookCause_ShortDescription_NoteHook_html(triggeredBy, - data.getMergeRequestIid(), + String.valueOf(data.getMergeRequestIid()), forkNamespace + data.getSourceBranch(), data.getTargetBranch(), data.getTargetProjectUrl());