p85947160
/
Gitee-Jenkins-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow null values for targetUrl as this isn't available in web hooks of older versions of GitLab (Fixes #402)

This commit is contained in:
Robin Müller 2016-08-31 12:47:39 +02:00
parent 92121e5b3b
commit 3fe8d554ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/dabsquared/gitlabjenkins/cause/CauseData.java
View File

@ -77,7 +77,7 @@ public final class CauseData {
this.before = before == null ? "" : before;
this.after = after == null ? "" : after;
this.lastCommit = checkNotNull(lastCommit, "lastCommit must not be null");
this.targetProjectUrl = checkNotNull(targetProjectUrl, "targetProjectUrl must not be null");
this.targetProjectUrl = targetProjectUrl;
}
public Map<String, String> getBuildVariables() {
@ -341,7 +341,7 @@ public final class CauseData {
@Override
String getShortDescription(CauseData data) {
String forkNamespace = StringUtils.equals(data.getSourceNamespace(), data.getTargetBranch()) ? "" : data.getSourceNamespace() + "/";
if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter) {
if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) {
return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_plain(data.getMergeRequestIid(),
forkNamespace + data.getSourceBranch(),
data.getTargetBranch());
@ -357,7 +357,7 @@ public final class CauseData {
String getShortDescription(CauseData data) {
String triggeredBy = data.getTriggeredByUser();
String forkNamespace = StringUtils.equals(data.getSourceNamespace(), data.getTargetBranch()) ? "" : data.getSourceNamespace() + "/";
if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter) {
if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) {
return Messages.GitLabWebHookCause_ShortDescription_NoteHook_plain(triggeredBy,
data.getMergeRequestIid(),
forkNamespace + data.getSourceBranch(),