Leave the previous values for gitlabUserName and gitlabUserEmail

jenkinsci · May 29, 2023 · 2e50c13 · 2e50c13
1 parent 1258e02
commit 2e50c13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...om/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java b/...om/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java
@@ -196,9 +196,11 @@ protected CauseData retrieveCauseData(MergeRequestHook hook) {
                 .withTargetProjectId(hook.getObjectAttributes().getTargetProjectId())
                 .withBranch(hook.getObjectAttributes().getSourceBranch())
                 .withSourceBranch(hook.getObjectAttributes().getSourceBranch())
-                .withUserName(hook.getUser().getName())
+                .withUserName(
+                        hook.getObjectAttributes().getLastCommit().getAuthor().getName())
                 .withUserUsername(hook.getUser().getUsername())
-                .withUserEmail(hook.getUser().getEmail())
+                .withUserEmail(
+                        hook.getObjectAttributes().getLastCommit().getAuthor().getEmail())
                 .withSourceRepoHomepage(hook.getObjectAttributes().getSource().getHomepage())
                 .withSourceRepoName(hook.getObjectAttributes().getSource().getName())
                 .withSourceNamespace(hook.getObjectAttributes().getSource().getNamespace())

diff --git a/...in/java/com/dabsquared/gitlabjenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java b/...in/java/com/dabsquared/gitlabjenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java
@@ -71,9 +71,10 @@ protected CauseData retrieveCauseData(NoteHook hook) {
                 .withTargetProjectId(hook.getMergeRequest().getTargetProjectId())
                 .withBranch(hook.getMergeRequest().getSourceBranch())
                 .withSourceBranch(hook.getMergeRequest().getSourceBranch())
-                .withUserName(hook.getUser().getName())
+                .withUserName(hook.getMergeRequest().getLastCommit().getAuthor().getName())
                 .withUserUsername(hook.getUser().getUsername())
-                .withUserEmail(hook.getUser().getEmail())
+                .withUserEmail(
+                        hook.getMergeRequest().getLastCommit().getAuthor().getEmail())
                 .withSourceRepoHomepage(hook.getMergeRequest().getSource().getHomepage())
                 .withSourceRepoName(hook.getMergeRequest().getSource().getName())
                 .withSourceNamespace(hook.getMergeRequest().getSource().getNamespace())