Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8e1df680
Commit
8e1df680
authored
Jun 14, 2018
by
gfyoung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix fields for author & assignee in MR API docs.
Closes #42445.
parent
69966fcb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
30 deletions
+37
-30
changelogs/unreleased/author-doc-fix.yml
changelogs/unreleased/author-doc-fix.yml
+5
-0
doc/api/merge_requests.md
doc/api/merge_requests.md
+32
-30
No files found.
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:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"source_project_id"
:
2
,
"target_project_id"
:
3
,
...
...
@@ -190,18 +190,18 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"source_project_id"
:
2
,
"target_project_id"
:
3
,
...
...
@@ -297,18 +297,18 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"source_project_id"
:
2
,
"target_project_id"
:
3
,
...
...
@@ -548,14 +548,16 @@ Parameters:
"username"
:
"jarrett"
,
"id"
:
5
,
"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"
:
{
"name"
:
"Administrator"
,
"username"
:
"root"
,
"id"
:
1
,
"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
,
"target_project_id"
:
4
,
...
...
@@ -669,18 +671,18 @@ POST /projects/:id/merge_requests
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"source_project_id"
:
3
,
"target_project_id"
:
4
,
...
...
@@ -761,18 +763,18 @@ Must include at least one non-required attribute from above.
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"source_project_id"
:
3
,
"target_project_id"
:
4
,
...
...
@@ -870,18 +872,18 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"source_project_id"
:
4
,
"target_project_id"
:
4
,
...
...
@@ -949,18 +951,18 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@example.com"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"avatar_url"
:
null
,
"web_url"
:
"https://gitlab.example.com/admin"
},
"source_project_id"
:
4
,
"target_project_id"
:
4
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment