Skip to content

Commit caa9359

Browse files
committed
updated to reflect testing date time stamps
1 parent 72e86a6 commit caa9359

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public class EventMergeRequest {
134134
private Long mergeUserId;
135135

136136
@JsonProperty("deleted_at")
137-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
137+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z")
138138
private Date deletedAt;
139139

140140
@JsonProperty("in_progress_merge_commit_sha")
@@ -144,7 +144,7 @@ public class EventMergeRequest {
144144
private Integer lockVersion;
145145

146146
@JsonProperty("last_edited_at")
147-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
147+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z")
148148
private Date lastEditedAt;
149149

150150
@JsonProperty("last_edited_by_id")

0 commit comments

Comments
 (0)