Add new merge request properties. (#509)

src/main/java/org/gitlab4j/api/models/MergeRequest.java

@@ -16,6 +16,7 @@ public class MergeRequest {
     private Assignee assignee;
     private List<Assignee> assignees;
     private Author author;
+    private Boolean blockingDiscussionsResolved;
     private List<Diff> changes;
     private Date closedAt;
     private Participant closedBy;
@@ -24,6 +25,7 @@ public class MergeRequest {
     private Boolean discussionLocked;
     private Integer downvotes;
     private Boolean forceRemoveSourceBranch;
+    private Boolean hasConflicts;
     private Integer id;
     private Integer iid;
     private List<String> labels;
@@ -113,6 +115,14 @@ public class MergeRequest {
         this.author = author;
     }
 
+    public Boolean getBlockingDiscussionsResolved() {
+        return blockingDiscussionsResolved;
+    }
+
+    public void setBlockingDiscussionsResolved(Boolean blockingDiscussionsResolved) {
+        this.blockingDiscussionsResolved = blockingDiscussionsResolved;
+    }
+
     public List<Diff> getChanges() {
         return changes;
     }
@@ -177,6 +187,14 @@ public class MergeRequest {
         this.forceRemoveSourceBranch = forceRemoveSourceBranch;
     }
 
+    public Boolean getHasConflicts() {
+        return hasConflicts;
+    }
+
+    public void setHasConflicts(Boolean hasConflicts) {
+        this.hasConflicts = hasConflicts;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -60,5 +60,7 @@
         "base_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00",
         "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
         "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
-    }
+    },
+    "has_conflicts": false,
+    "blocking_discussions_resolved": true
 }