Skip to content

Commit

Permalink
Release 10.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
orta committed Feb 4, 2021
1 parent 03c44a2 commit 913db0e
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
72 changes: 72 additions & 0 deletions source/danger-incoming-process-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
21 changes: 21 additions & 0 deletions source/danger.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 913db0e

Please sign in to comment.