fix: jenkinsci#636 fix Jenkins won't trigger a build of merge commit …

…on merged Merge Request
yili1992 · Mar 23, 2021 · efcd270 · efcd270
1 parent 699474c
commit efcd270
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...om/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java b/...om/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java
@@ -258,6 +258,11 @@ private String getTargetBranchFromBuild(Run<?, ?> mergeBuild) {
  return cause == null ? null : cause.getData().getTargetBranch();
  }
 
+ private String getTargetMergeRequestStateFromBuild(Run<?, ?> mergeBuild) {
+ GitLabWebHookCause cause = mergeBuild.getCause(GitLabWebHookCause.class);
+ return cause == null ? null : cause.getData().getMergeRequestState();
+ }
+
  private boolean isAllowedByConfig(MergeRequestObjectAttributes objectAttributes) {
  return triggerConfig.apply(objectAttributes);
  }