summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorJoe Robinson <joe@lc8n.com>2015-12-10 23:51:48 +0000
committerJoe Robinson <joe@lc8n.com>2015-12-10 23:51:48 +0000
commitfb9d381938d026cfcca564f64d795a832486165e (patch)
treeb5a460ed6fa5d4a43e02fc4451d006118430db3d /src/main
parent523c3ec09b609d030a432dbdb5d02f1f7e120b74 (diff)
Add annotation to fix object attributes
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/uk/co/blatech/blaears/models/gitlab/Merge.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/uk/co/blatech/blaears/models/gitlab/Merge.java b/src/main/java/uk/co/blatech/blaears/models/gitlab/Merge.java
index d8eaa99..18c910d 100644
--- a/src/main/java/uk/co/blatech/blaears/models/gitlab/Merge.java
+++ b/src/main/java/uk/co/blatech/blaears/models/gitlab/Merge.java
@@ -11,6 +11,7 @@ public class Merge {
@JsonProperty("object_kind")
String objectKind;
User user;
+ @JsonProperty("object_attributes")
ObjectAttributes objectAttributes;
String url;