Add latest changes from gitlab-org/gitlab@master

1 files changed, 73 insertions, 83 deletions

diff --git a/doc/api/issues.md b/doc/api/issues.md
index 79b1fc78108..a9a3f04a064 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -591,83 +591,79 @@ Example response:
 
 ```json
 {
-   "id" : 1,
-   "milestone" : {
-      "due_date" : null,
-      "project_id" : 4,
-      "state" : "closed",
-      "description" : "Rerum est voluptatem provident consequuntur molestias similique ipsum dolor.",
-      "iid" : 3,
-      "id" : 11,
-      "title" : "v3.0",
-      "created_at" : "2016-01-04T15:31:39.788Z",
-      "updated_at" : "2016-01-04T15:31:39.788Z",
-      "closed_at" : "2016-01-05T15:31:46.176Z"
-   },
-   "author" : {
-      "state" : "active",
-      "web_url" : "https://gitlab.example.com/root",
-      "avatar_url" : null,
-      "username" : "root",
-      "id" : 1,
-      "name" : "Administrator"
-   },
-   "description" : "Omnis vero earum sunt corporis dolor et placeat.",
-   "state" : "closed",
-   "iid" : 1,
-   "assignees" : [{
-      "avatar_url" : null,
-      "web_url" : "https://gitlab.example.com/lennie",
-      "state" : "active",
-      "username" : "lennie",
-      "id" : 9,
-      "name" : "Dr. Luella Kovacek"
-   }],
-   "assignee" : {
-      "avatar_url" : null,
-      "web_url" : "https://gitlab.example.com/lennie",
-      "state" : "active",
-      "username" : "lennie",
-      "id" : 9,
-      "name" : "Dr. Luella Kovacek"
-   },
-   "labels" : [],
-   "upvotes": 4,
-   "downvotes": 0,
-   "merge_requests_count": 0,
-   "title" : "Ut commodi ullam eos dolores perferendis nihil sunt.",
-   "updated_at" : "2016-01-04T15:31:46.176Z",
-   "created_at" : "2016-01-04T15:31:46.176Z",
-   "closed_at" : null,
-   "closed_by" : null,
-   "subscribed": false,
-   "user_notes_count": 1,
-   "due_date": null,
-   "web_url": "http://example.com/my-group/my-project/issues/1",
-   "references": {
-     "short": "#1",
-     "relative": "#1",
-     "full": "my-group/my-project#1"
-   },
-   "time_stats": {
-      "time_estimate": 0,
-      "total_time_spent": 0,
-      "human_time_estimate": null,
-      "human_total_time_spent": null
-   },
-   "confidential": false,
-   "discussion_locked": false,
-   "_links": {
-      "self": "http://example.com/api/v4/projects/1/issues/2",
-      "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
-      "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
-      "project": "http://example.com/api/v4/projects/1"
-   },
-   "task_completion_status":{
-      "count":0,
-      "completed_count":0
-   },
-   "weight": null,
+  "id": 1,
+  "milestone": {
+    "due_date": null,
+    "project_id": 4,
+    "state": "closed",
+    "description": "Rerum est voluptatem provident consequuntur molestias similique ipsum dolor.",
+    "iid": 3,
+    "id": 11,
+    "title": "v3.0",
+    "created_at": "2016-01-04T15:31:39.788Z",
+    "updated_at": "2016-01-04T15:31:39.788Z",
+    "closed_at": "2016-01-05T15:31:46.176Z"
+  },
+  "author": {
+    "state": "active",
+    "web_url": "https://gitlab.example.com/root",
+    "avatar_url": null,
+    "username": "root",
+    "id": 1,
+    "name": "Administrator"
+  },
+  "description": "Omnis vero earum sunt corporis dolor et placeat.",
+  "state": "closed",
+  "iid": 1,
+  "assignees": [
+    {
+      "avatar_url": null,
+      "web_url": "https://gitlab.example.com/lennie",
+      "state": "active",
+      "username": "lennie",
+      "id": 9,
+      "name": "Dr. Luella Kovacek"
+    }
+  ],
+  "assignee": {
+    "avatar_url": null,
+    "web_url": "https://gitlab.example.com/lennie",
+    "state": "active",
+    "username": "lennie",
+    "id": 9,
+    "name": "Dr. Luella Kovacek"
+  },
+  "labels": [],
+  "upvotes": 4,
+  "downvotes": 0,
+  "merge_requests_count": 0,
+  "title": "Ut commodi ullam eos dolores perferendis nihil sunt.",
+  "updated_at": "2016-01-04T15:31:46.176Z",
+  "created_at": "2016-01-04T15:31:46.176Z",
+  "closed_at": null,
+  "closed_by": null,
+  "subscribed": false,
+  "user_notes_count": 1,
+  "due_date": null,
+  "web_url": "http://example.com/my-group/my-project/issues/1",
+  "references": {
+    "short": "#1",
+    "relative": "#1",
+    "full": "my-group/my-project#1"
+  },
+  "time_stats": {
+    "time_estimate": 0,
+    "total_time_spent": 0,
+    "human_time_estimate": null,
+    "human_total_time_spent": null
+  },
+  "confidential": false,
+  "discussion_locked": false,
+  "task_completion_status": {
+    "count": 0,
+    "completed_count": 0
+  },
+  "weight": null,
   "has_tasks": false,
   "_links": {
     "self": "http://gitlab.example:3000/api/v4/projects/1/issues/1",
@@ -675,12 +671,6 @@ Example response:
     "award_emoji": "http://gitlab.example:3000/api/v4/projects/1/issues/1/award_emoji",
     "project": "http://gitlab.example:3000/api/v4/projects/1"
   },
-  "references": {
-    "short": "#1",
-    "relative": "#1",
-    "full": "gitlab-org/gitlab-test#1"
-  },
-  "subscribed": true,
   "moved_to_id": null,
   "service_desk_reply_to": "service.desk@gitlab.com",
   "epic_iid": null,