Skip to content

G
gitlab-ce
Commit 96a6e6ab authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files
Options

Resolve doc/api/issues.md

parent 5ca43583
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 20 deletions
doc/api/issues.md
View file @ 96a6e6ab
...@@ -360,16 +360,13 @@ Example response: ...@@ -360,16 +360,13 @@ Example response:
"due_date": null, "due_date": null,
"web_url": "http://example.com/example/example/issues/1", "web_url": "http://example.com/example/example/issues/1",
"confidential": false, "confidential": false,
<<<<<<< HEAD "weight": null,
"weight": null
=======
"_links": { "_links": {
"self": "http://example.com/api/v4/projects/1/issues/2", "self": "http://example.com/api/v4/projects/1/issues/2",
"notes": "http://example.com/api/v4/projects/1/issues/2/notes", "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
"award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji", "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
"project": "http://example.com/api/v4/projects/1" "project": "http://example.com/api/v4/projects/1"
} }
>>>>>>> upstream/master
} }
``` ```
...@@ -433,16 +430,13 @@ Example response: ...@@ -433,16 +430,13 @@ Example response:
"due_date": null, "due_date": null,
"web_url": "http://example.com/example/example/issues/14", "web_url": "http://example.com/example/example/issues/14",
"confidential": false, "confidential": false,
<<<<<<< HEAD "weight": null,
"weight": null
=======
"_links": { "_links": {
"self": "http://example.com/api/v4/projects/1/issues/2", "self": "http://example.com/api/v4/projects/1/issues/2",
"notes": "http://example.com/api/v4/projects/1/issues/2/notes", "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
"award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji", "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
"project": "http://example.com/api/v4/projects/1" "project": "http://example.com/api/v4/projects/1"
} }
>>>>>>> upstream/master
} }
``` ```
...@@ -507,16 +501,13 @@ Example response: ...@@ -507,16 +501,13 @@ Example response:
"due_date": "2016-07-22", "due_date": "2016-07-22",
"web_url": "http://example.com/example/example/issues/15", "web_url": "http://example.com/example/example/issues/15",
"confidential": false, "confidential": false,
<<<<<<< HEAD "weight": null,
"weight": null
=======
"_links": { "_links": {
"self": "http://example.com/api/v4/projects/1/issues/2", "self": "http://example.com/api/v4/projects/1/issues/2",
"notes": "http://example.com/api/v4/projects/1/issues/2/notes", "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
"award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji", "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
"project": "http://example.com/api/v4/projects/1" "project": "http://example.com/api/v4/projects/1"
} }
>>>>>>> upstream/master
} }
``` ```
...@@ -603,16 +594,13 @@ Example response: ...@@ -603,16 +594,13 @@ Example response:
"due_date": null, "due_date": null,
"web_url": "http://example.com/example/example/issues/11", "web_url": "http://example.com/example/example/issues/11",
"confidential": false, "confidential": false,
<<<<<<< HEAD "weight": null,
"weight": null
=======
"_links": { "_links": {
"self": "http://example.com/api/v4/projects/1/issues/2", "self": "http://example.com/api/v4/projects/1/issues/2",
"notes": "http://example.com/api/v4/projects/1/issues/2/notes", "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
"award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji", "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
"project": "http://example.com/api/v4/projects/1" "project": "http://example.com/api/v4/projects/1"
} }
>>>>>>> upstream/master
} }
``` ```
...@@ -678,16 +666,13 @@ Example response: ...@@ -678,16 +666,13 @@ Example response:
"due_date": null, "due_date": null,
"web_url": "http://example.com/example/example/issues/11", "web_url": "http://example.com/example/example/issues/11",
"confidential": false, "confidential": false,
<<<<<<< HEAD "weight": null,
"weight": null
=======
"_links": { "_links": {
"self": "http://example.com/api/v4/projects/1/issues/2", "self": "http://example.com/api/v4/projects/1/issues/2",
"notes": "http://example.com/api/v4/projects/1/issues/2/notes", "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
"award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji", "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
"project": "http://example.com/api/v4/projects/1" "project": "http://example.com/api/v4/projects/1"
} }
>>>>>>> upstream/master
} }
``` ```
......
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