From ae6df39b854c8a02fed6df58109fb7ec7cc15420 Mon Sep 17 00:00:00 2001 From: Martin d'Anjou Date: Wed, 5 Aug 2015 14:25:55 -0400 Subject: [PATCH 1/2] Ignore Session.vim --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) 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 From 54b44018a844a28fd774311a24123ec9648c7c84 Mon Sep 17 00:00:00 2001 From: Martin d'Anjou Date: Wed, 5 Aug 2015 14:26:36 -0400 Subject: [PATCH 2/2] Preliminary experiment pass pull-requests/N/from to Jenkins --- .../com/nerdwin15/stash/webhook/PullRequestEventListener.java | 3 +-- src/main/resources/static/jenkins-pr-triggerbutton.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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(); };