From 913db0e8ba751dacbc56609f4db2dabb4d8871aa Mon Sep 17 00:00:00 2001 From: Orta Date: Thu, 4 Feb 2021 09:38:50 +0000 Subject: [PATCH] Release 10.6.2 --- package.json | 2 +- source/danger-incoming-process-schema.json | 72 ++++++++++++++++++++++ source/danger.d.ts | 21 +++++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d594cbc54..330104da9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "danger", - "version": "10.6.1", + "version": "10.6.2", "description": "Unit tests for Team Culture", "main": "distribution/danger.js", "typings": "distribution/danger.d.ts", diff --git a/source/danger-incoming-process-schema.json b/source/danger-incoming-process-schema.json index 92379bb15..42bc3ed75 100644 --- a/source/danger-incoming-process-schema.json +++ b/source/danger-incoming-process-schema.json @@ -1575,9 +1575,81 @@ }, "type": "object" }, + "GitLabApproval": { + "properties": { + "approvals_left": { + "type": "number" + }, + "approvals_required": { + "type": "number" + }, + "approved_by": { + "anyOf": [ + { + "items": { + "properties": { + "user": { + "$ref": "#/definitions/GitLabUser" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "items": { + "$ref": "#/definitions/GitLabUser" + }, + "type": "array" + } + ] + }, + "created_at": { + "type": "string" + }, + "description": { + "type": "string" + }, + "id": { + "type": "number" + }, + "iid": { + "type": "number" + }, + "merge_status": { + "enum": [ + "can_be_merged" + ], + "type": "string" + }, + "project_id": { + "type": "number" + }, + "state": { + "enum": [ + "closed", + "locked", + "merged", + "open" + ], + "type": "string" + }, + "title": { + "type": "string" + }, + "updated_at": { + "type": "string" + } + }, + "type": "object" + }, "GitLabDSL": { "description": "The GitLab metadata for your MR", "properties": { + "approvals": { + "$ref": "#/definitions/GitLabApproval", + "description": "Merge Request-level MR approvals Configuration" + }, "commits": { "description": "All of the individual commits in the merge request", "items": { diff --git a/source/danger.d.ts b/source/danger.d.ts index 0c07ec32a..d412a4ad3 100644 --- a/source/danger.d.ts +++ b/source/danger.d.ts @@ -1445,6 +1445,8 @@ interface GitLabJSONDSL { mr: GitLabMR /** All of the individual commits in the merge request */ commits: GitLabMRCommit[] + /** Merge Request-level MR approvals Configuration */ + approvals: GitLabApproval } // danger.gitlab @@ -1703,6 +1705,25 @@ interface GitLabRepositoryCompare { compare_timeout: boolean compare_same_ref: boolean } + +interface GitLabApproval { + id: number + iid: number + project_id: number + title: string + description: string + state: "closed" | "open" | "locked" | "merged" + created_at: string + updated_at: string + merge_status: "can_be_merged" + approvals_required: number + approvals_left: number + approved_by?: + | { + user: GitLabUser + }[] + | GitLabUser[] +} /** * The result of user doing warn, message or fail, built this way for * expansion later.