Add Merge Error field on Merge Request Model (#602)

Add Missing MergeRequest field Adds the "merge_error" field, that gets field when rebasing / merging through the API fails for any reason
ubisoft · Dec 18, 2023 · 4278a31 · 4278a31
1 parent 658a3fb
commit 4278a31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/NGitLab/Models/MergeRequest.cs b/NGitLab/Models/MergeRequest.cs
@@ -147,5 +147,8 @@ public class MergeRequest
     [JsonPropertyName("detailed_merge_status")]
     public DynamicEnum<DetailedMergeStatus> DetailedMergeStatus { get; set; }
 
+    [JsonPropertyName("merge_error")]
+    public string MergeError { get; set; }
+
     public override string ToString() => $"!{Id.ToStringInvariant()}: {Title}";
 }
diff --git a/NGitLab/PublicAPI.Unshipped.txt b/NGitLab/PublicAPI.Unshipped.txt
@@ -2234,6 +2234,8 @@ NGitLab.Models.MergeRequest.Labels -> string[]
 NGitLab.Models.MergeRequest.MergeCommitSha -> string
 NGitLab.Models.MergeRequest.MergedAt -> System.DateTime?
 NGitLab.Models.MergeRequest.MergedBy -> NGitLab.Models.User
+NGitLab.Models.MergeRequest.MergeError.get -> string
+NGitLab.Models.MergeRequest.MergeError.set -> void
 NGitLab.Models.MergeRequest.MergeRequest() -> void
 NGitLab.Models.MergeRequest.MergeStatus -> string
 NGitLab.Models.MergeRequest.MergeWhenPipelineSucceeds -> bool