diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-12 09:09:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-12 09:09:31 +0000 |
| commit | 0e1a6f6a2b28464e6ad151da4dced6d603bd11b0 (patch) | |
| tree | b84d68dca1be62e789da50841ed283d99a4284b5 /doc | |
| parent | 143f7be045960f8d51dea738781535d614956f84 (diff) | |
| download | gitlab-ce-0e1a6f6a2b28464e6ad151da4dced6d603bd11b0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/merge_requests.md | 2 | ||||
| -rw-r--r-- | doc/api/packages.md | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 86c558c582c..ffe73638dc1 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -1130,6 +1130,8 @@ PUT /projects/:id/merge_requests/:merge_request_iid | `assignee_ids` | integer array | no | The ID of the user(s) to assign the MR to. Set to `0` or provide an empty value to unassign all assignees. | | `milestone_id` | integer | no | The global ID of a milestone to assign the merge request to. Set to `0` or provide an empty value to unassign a milestone.| | `labels` | string | no | Comma-separated label names for a merge request. Set to an empty string to unassign all labels. | +| `add_labels` | string | no | Comma-separated label names to add to a merge request. | +| `remove_labels` | string | no | Comma-separated label names to remove from a merge request. | | `description` | string | no | Description of MR. Limited to 1,048,576 characters. | | `state_event` | string | no | New state (close/reopen) | | `remove_source_branch` | boolean | no | Flag indicating if a merge request should remove the source branch when merging | diff --git a/doc/api/packages.md b/doc/api/packages.md index c68c16e92a7..784343d29fd 100644 --- a/doc/api/packages.md +++ b/doc/api/packages.md @@ -188,7 +188,27 @@ Example response: "name": "Administrator", "avatar_url": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon" } - } + }, + "versions": [ + { + "id":2, + "version":"2.0-SNAPSHOT", + "created_at":"2020-04-28T04:42:11.573Z", + "pipeline": { + "id": 234, + "status": "pending", + "ref": "new-pipeline", + "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a", + "web_url": "https://example.com/foo/bar/pipelines/58", + "created_at": "2016-08-11T11:28:34.085Z", + "updated_at": "2016-08-11T11:32:35.169Z", + "user": { + "name": "Administrator", + "avatar_url": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon" + } + } + } + ] } ``` |