Commit 95578588 authored by Adam Lesiak's avatar Adam Lesiak Committed by Greg Messner
Browse files

Fix #323 merge_commit_sha field is missing in merge request event (#324)

* Added EventMergeRequest.mergeCommitSha field (#323)
parent 53784920
...@@ -18,6 +18,7 @@ public class EventMergeRequest { ...@@ -18,6 +18,7 @@ public class EventMergeRequest {
private String description; private String description;
private Integer id; private Integer id;
private Integer iid; private Integer iid;
private String mergeCommitSha;
private String mergeStatus; private String mergeStatus;
private Integer milestoneId; private Integer milestoneId;
private Integer position; private Integer position;
...@@ -97,6 +98,14 @@ public class EventMergeRequest { ...@@ -97,6 +98,14 @@ public class EventMergeRequest {
this.iid = iid; this.iid = iid;
} }
public String getMergeCommitSha() {
return mergeCommitSha;
}
public void setMergeCommitSha(String mergeCommitSha) {
this.mergeCommitSha = mergeCommitSha;
}
public String getMergeStatus() { public String getMergeStatus() {
return this.mergeStatus; return this.mergeStatus;
} }
......
package org.gitlab4j.api.webhook; package org.gitlab4j.api.webhook;
import org.gitlab4j.api.webhook.IssueEvent;
import org.gitlab4j.api.webhook.MergeRequestEvent;
import org.gitlab4j.api.webhook.PushEvent;
/** /**
* This interface defines an event listener for the event fired when * This interface defines an event listener for the event fired when
* a WebHook notification has been received from a GitLab server. * a WebHook notification has been received from a GitLab server.
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
"merge_status": "unchecked", "merge_status": "unchecked",
"target_project_id": 14, "target_project_id": 14,
"iid": 1, "iid": 1,
"merge_commit_sha": "5f72688f7af57df23ee7510cec59b909289964f1",
"description": "", "description": "",
"source":{ "source":{
"name":"Awesome Project", "name":"Awesome Project",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment