Commit 32eb941b authored by Cédric Tabin's avatar Cédric Tabin Committed by Tim Olshansky

add missing field mergeCommitSHA and json property SHA (#212)

parent 5b99e864
...@@ -49,6 +49,8 @@ public class GitlabMergeRequest { ...@@ -49,6 +49,8 @@ public class GitlabMergeRequest {
@JsonProperty("created_at") @JsonProperty("created_at")
private Date createdAt; private Date createdAt;
@JsonProperty("merge_commit_sha")
private String mergeCommitSHA;
@JsonProperty("merge_status") @JsonProperty("merge_status")
private String mergeStatus; private String mergeStatus;
...@@ -56,6 +58,7 @@ public class GitlabMergeRequest { ...@@ -56,6 +58,7 @@ public class GitlabMergeRequest {
@JsonProperty("web_url") @JsonProperty("web_url")
private String webUrl; private String webUrl;
@JsonProperty("sha")
private String sha; private String sha;
public Integer getId() { public Integer getId() {
...@@ -244,9 +247,21 @@ public class GitlabMergeRequest { ...@@ -244,9 +247,21 @@ public class GitlabMergeRequest {
this.changes = changes; this.changes = changes;
} }
public String getMergeStatus() { return mergeStatus; } public String getMergeCommitSHA() {
return mergeCommitSHA;
}
public void setMergeCommitSHA(String mergeCommitSHA) {
this.mergeCommitSHA = mergeCommitSHA;
}
public void setMergeStatus(String mergeStatus) { this.mergeStatus = mergeStatus; } public String getMergeStatus() {
return mergeStatus;
}
public void setMergeStatus(String mergeStatus) {
this.mergeStatus = mergeStatus;
}
public String getWebUrl() { public String getWebUrl() {
return webUrl; return webUrl;
......
Markdown is supported
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