Skip to content

G
gitlab-ce
Commit 8e1df680 authored by gfyoung's avatar gfyoung
Browse files
Options

Fix fields for author & assignee in MR API docs. 

Closes #42445.
parent 69966fcb
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 30 deletions
changelogs/unreleased/author-doc-fix.yml 0 → 100644
View file @ 8e1df680
---
title: Fix fields for author & assignee in MR API docs.
merge_request: 19798
author: gfyoung
type: fixed
doc/api/merge_requests.md
View file @ 8e1df680
...@@ -70,18 +70,18 @@ Parameters: ...@@ -70,18 +70,18 @@ Parameters:
"author": { "author": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"assignee": { "assignee": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"source_project_id": 2, "source_project_id": 2,
"target_project_id": 3, "target_project_id": 3,
...@@ -190,18 +190,18 @@ Parameters: ...@@ -190,18 +190,18 @@ Parameters:
"author": { "author": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"assignee": { "assignee": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"source_project_id": 2, "source_project_id": 2,
"target_project_id": 3, "target_project_id": 3,
...@@ -297,18 +297,18 @@ Parameters: ...@@ -297,18 +297,18 @@ Parameters:
"author": { "author": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"assignee": { "assignee": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"source_project_id": 2, "source_project_id": 2,
"target_project_id": 3, "target_project_id": 3,
...@@ -548,14 +548,16 @@ Parameters: ...@@ -548,14 +548,16 @@ Parameters:
"username": "jarrett", "username": "jarrett",
"id": 5, "id": 5,
"state": "active", "state": "active",
"avatar_url": "http://www.gravatar.com/avatar/b95567800f828948baf5f4160ebb2473?s=40&d=identicon" "avatar_url": "http://www.gravatar.com/avatar/b95567800f828948baf5f4160ebb2473?s=40&d=identicon",
"web_url" : "https://gitlab.example.com/jarrett"
}, },
"assignee": { "assignee": {
"name": "Administrator", "name": "Administrator",
"username": "root", "username": "root",
"id": 1, "id": 1,
"state": "active", "state": "active",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40&d=identicon" "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40&d=identicon",
"web_url" : "https://gitlab.example.com/root"
}, },
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
...@@ -669,18 +671,18 @@ POST /projects/:id/merge_requests ...@@ -669,18 +671,18 @@ POST /projects/:id/merge_requests
"author": { "author": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"assignee": { "assignee": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"source_project_id": 3, "source_project_id": 3,
"target_project_id": 4, "target_project_id": 4,
...@@ -761,18 +763,18 @@ Must include at least one non-required attribute from above. ...@@ -761,18 +763,18 @@ Must include at least one non-required attribute from above.
"author": { "author": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"assignee": { "assignee": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"source_project_id": 3, "source_project_id": 3,
"target_project_id": 4, "target_project_id": 4,
...@@ -870,18 +872,18 @@ Parameters: ...@@ -870,18 +872,18 @@ Parameters:
"author": { "author": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"assignee": { "assignee": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
...@@ -949,18 +951,18 @@ Parameters: ...@@ -949,18 +951,18 @@ Parameters:
"author": { "author": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"assignee": { "assignee": {
"id": 1, "id": 1,
"username": "admin", "username": "admin",
"email": "admin@example.com",
"name": "Administrator", "name": "Administrator",
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "avatar_url": null,
"web_url" : "https://gitlab.example.com/admin"
}, },
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7