diff --git a/.gitignore b/.gitignore index fb11f9a..31015a8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ Thumbs.db .settings target *.class + +Session.vim diff --git a/src/main/java/com/nerdwin15/stash/webhook/PullRequestEventListener.java b/src/main/java/com/nerdwin15/stash/webhook/PullRequestEventListener.java index c389a20..f152fd7 100644 --- a/src/main/java/com/nerdwin15/stash/webhook/PullRequestEventListener.java +++ b/src/main/java/com/nerdwin15/stash/webhook/PullRequestEventListener.java @@ -63,8 +63,7 @@ protected void handleEvent(PullRequestEvent event) { return; } - String strRef = event.getPullRequest().getFromRef().toString() - .replaceFirst(".*refs/heads/", ""); + String strRef = "refs/pull-requests/"+event.getPullRequest().getId().toString()+"/from"; String strSha1 = event.getPullRequest().getFromRef().getLatestChangeset(); EventContext context = new EventContext(event, diff --git a/src/main/resources/static/jenkins-pr-triggerbutton.js b/src/main/resources/static/jenkins-pr-triggerbutton.js index a9a0a1f..90b2158 100644 --- a/src/main/resources/static/jenkins-pr-triggerbutton.js +++ b/src/main/resources/static/jenkins-pr-triggerbutton.js @@ -8,7 +8,7 @@ define('plugin/jenkins/pr-triggerbutton', [ return AJS.contextPath() + '/rest/jenkins/latest/projects/' + pageState.getProject().getKey() + '/repos/' + pageState.getRepository().getSlug() + '/triggerJenkins' - + '?branches=' + pageState.getPullRequest().getFromRef().getDisplayId() + + '?branches=pull-requests/' + pageState.getPullRequest().getId() + '/from' + '&sha1=' + pageState.getPullRequest().getFromRef().getLatestChangeset(); };