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

Revert "Update the commit status for MRs always on the target project (Fixes #344)" 

- if the commit status is updated for the upstream (target) project GitLab doesn't show this for a MR
This commit is contained in:
Robin Müller 2016-09-12 21:27:24 +02:00
parent b16e4bac34
commit ee4c3d62ff
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java
View File

@ -103,7 +103,7 @@ class MergeRequestHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler<M
@Override
protected BuildStatusUpdate retrieveBuildStatusUpdate(MergeRequestHook hook) {
return buildStatusUpdate()
.withProjectId(hook.getObjectAttributes().getTargetProjectId())
.withProjectId(hook.getObjectAttributes().getSourceProjectId())
.withSha(hook.getObjectAttributes().getLastCommit().getId())
.withRef(hook.getObjectAttributes().getSourceBranch())
.build();

2
src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java
View File

@ -91,7 +91,7 @@ class NoteHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler<NoteHook>
@Override
protected BuildStatusUpdate retrieveBuildStatusUpdate(NoteHook hook) {
return buildStatusUpdate()
.withProjectId(hook.getMergeRequest().getTargetProjectId())
.withProjectId(hook.getMergeRequest().getSourceProjectId())
.withSha(hook.getMergeRequest().getLastCommit().getId())
.withRef(hook.getMergeRequest().getSourceBranch())
.build();

2
src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/push/OpenMergeRequestPushHookTriggerHandler.java
View File

@ -100,7 +100,7 @@ class OpenMergeRequestPushHookTriggerHandler implements PushHookTriggerHandler {
Branch branch = client.getBranch(mergeRequest.getSourceProjectId().toString(), sourceBranch);
Project project = client.getProject(mergeRequest.getSourceProjectId().toString());
String commit = branch.getCommit().getId();
setCommitStatusPendingIfNecessary(job, mergeRequest.getTargetProjectId(), commit, branch.getName());
setCommitStatusPendingIfNecessary(job, mergeRequest.getSourceProjectId(), commit, branch.getName());
List<Action> actions = Arrays.<Action>asList(new CauseAction(new GitLabWebHookCause(retrieveCauseData(hook, project, mergeRequest, branch))),
new RevisionParameterAction(commit, retrieveUrIish(hook)));

2
src/main/java/com/dabsquared/gitlabjenkins/util/CommitStatusUpdater.java
View File

@ -116,7 +116,7 @@ public class CommitStatusUpdater {
GitLabWebHookCause cause = build.getCause(GitLabWebHookCause.class);
if (cause != null) {
return Collections.singletonList(cause.getData().getTargetProjectId().toString());
return Collections.singletonList(cause.getData().getSourceProjectId().toString());
}
List<String> result = new ArrayList<>();