Extra merge status values

Signed-off-by: Tim McGilchrist <timmcgil@gmail.com>
tmcgilchrist · Jan 10, 2022 · d7d9893 · d7d9893
1 parent 9f80014
commit d7d9893
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cli/lab.md b/cli/lab.md
@@ -9,8 +9,8 @@ $ ./lab.exe api "https://gitlab.com/api/v4/users?username=tmcgilchrist"
 [
   {
     "id": 490393,
-    "name": "Tim McGilchrist",
     "username": "tmcgilchrist",
+    "name": "Tim McGilchrist",
     "state": "active",
     "avatar_url":
       "https://secure.gravatar.com/avatar/67afd2b4c98c9befd18c19f0ee9d94dc?s=80&d=identicon",
@@ -35,6 +35,7 @@ $ GITLAB_DEBUG=true ./lab.exe user-projects  --owner 490393
 >>> GitLab: Requesting https://gitlab.com/api/v4/users/490393/projects
 >>> GitLab: Response code 200 OK
 
+tezos
 ocaml-changes
 ocaml-gitlab
 freer

diff --git a/lib/gitlab.atd b/lib/gitlab.atd
@@ -253,6 +253,7 @@ type merge_status = [
   | CanBeMerged <json name="can_be_merged">
   | CannotBeMerged <json name="cannot_be_merged">
   | CannotBeMergedRecheck <json name="cannot_be_merged_recheck">
+  | Preparing <json name="preparing">
 ]
 
 type milestone_state = [