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

Added MergeRequest.mergeError (#444) (#445)

parent ad3eed8e
...@@ -31,6 +31,7 @@ public class MergeRequest { ...@@ -31,6 +31,7 @@ public class MergeRequest {
private Date mergedAt; private Date mergedAt;
private Participant mergedBy; private Participant mergedBy;
private Boolean mergeWhenPipelineSucceeds; private Boolean mergeWhenPipelineSucceeds;
private String mergeError;
private Milestone milestone; private Milestone milestone;
private Integer projectId; private Integer projectId;
private String sha; private String sha;
...@@ -228,6 +229,14 @@ public class MergeRequest { ...@@ -228,6 +229,14 @@ public class MergeRequest {
this.mergeWhenPipelineSucceeds = mergeWhenPipelineSucceeds; this.mergeWhenPipelineSucceeds = mergeWhenPipelineSucceeds;
} }
public String getMergeError() {
return mergeError;
}
public void setMergeError(String mergeError) {
this.mergeError = mergeError;
}
public Milestone getMilestone() { public Milestone getMilestone() {
return milestone; return milestone;
} }
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"avatar_url": "https://www.google.com/", "avatar_url": "https://www.google.com/",
"web_url": "https://www.google.com/" "web_url": "https://www.google.com/"
}, },
"merge_error": "Merge request is not mergeable",
"author":{ "author":{
"id":1, "id":1,
"username": "admin", "username": "admin",
......
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