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

Merge pull request #215 from team-supercharge/fix-buildOpenMergeRequests 

Fix error "failed to communicate with gitlab server ..." when try to rebuild open MRs
This commit is contained in:
coder-hugo 2016-03-16 22:13:45 +01:00
parent 0b08bc084d a14fa4c6ed
commit 90a9914602
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/dabsquared/gitlabjenkins/GitLabWebHook.java
View File

@ -399,11 +399,17 @@ public class GitLabWebHook implements UnprotectedRootAction {
LOGGER.log(Level.INFO, "Skipping MR " + mr.getTitle() + " due to ci-skip.");
continue;
}
GitlabBranch branch = api.instance().getBranch(api.instance().getProject(projectId), mr.getSourceBranch());
Integer srcProjectId = projectId;
if (!projectRef.endsWith(mr.getSourceBranch())) {
srcProjectId = mr.getSourceProjectId();
}
GitlabBranch branch = api.instance().getBranch(api.instance().getProject(srcProjectId), mr.getSourceBranch());
LastCommit lastCommit = new LastCommit();
lastCommit.setId(branch.getCommit().getId());
lastCommit.setMessage(branch.getCommit().getMessage());
lastCommit.setUrl(GitlabProject.URL + "/" + projectId + "/repository" + GitlabCommit.URL + "/"
lastCommit.setUrl(GitlabProject.URL + "/" + srcProjectId + "/repository" + GitlabCommit.URL + "/"
+ branch.getCommit().getId());
LOGGER.log(Level.FINE,