Skip to content

Commit 9557858

Browse files
lesiakgmessner
authored andcommitted
Fix #323 merge_commit_sha field is missing in merge request event (#324)
* Added EventMergeRequest.mergeCommitSha field (#323)
1 parent 5378492 commit 9557858

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public class EventMergeRequest {
1818
private String description;
1919
private Integer id;
2020
private Integer iid;
21+
private String mergeCommitSha;
2122
private String mergeStatus;
2223
private Integer milestoneId;
2324
private Integer position;
@@ -97,6 +98,14 @@ public void setIid(Integer iid) {
9798
this.iid = iid;
9899
}
99100

101+
public String getMergeCommitSha() {
102+
return mergeCommitSha;
103+
}
104+
105+
public void setMergeCommitSha(String mergeCommitSha) {
106+
this.mergeCommitSha = mergeCommitSha;
107+
}
108+
100109
public String getMergeStatus() {
101110
return this.mergeStatus;
102111
}

src/main/java/org/gitlab4j/api/webhook/WebHookListener.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11

22
package org.gitlab4j.api.webhook;
33

4-
import org.gitlab4j.api.webhook.IssueEvent;
5-
import org.gitlab4j.api.webhook.MergeRequestEvent;
6-
import org.gitlab4j.api.webhook.PushEvent;
7-
84
/**
95
* This interface defines an event listener for the event fired when
106
* a WebHook notification has been received from a GitLab server.

src/test/resources/org/gitlab4j/api/merge-request-event.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"merge_status": "unchecked",
4141
"target_project_id": 14,
4242
"iid": 1,
43+
"merge_commit_sha": "5f72688f7af57df23ee7510cec59b909289964f1",
4344
"description": "",
4445
"source":{
4546
"name":"Awesome Project",

0 commit comments

Comments
 (0)