Add latest changes from gitlab-org/gitlab@master

5 files changed, 30 insertions, 3 deletions

diff --git a/doc/api/epics.md b/doc/api/epics.md
index 4b20534eeed..109c12c1052 100644
--- a/doc/api/epics.md
+++ b/doc/api/epics.md
@@ -53,6 +53,7 @@ GET /groups/:id/epics?state=opened
 | `id`                | integer/string   | yes        | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user               |
 | `author_id`         | integer          | no         | Return epics created by the given user `id`                                                                                 |
 | `labels`            | string           | no         | Return epics matching a comma separated list of labels names. Label names from the epic group or a parent group can be used |
+| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:description_html`, `:text_color`. Default is `false`. Introduced in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413)|
 | `order_by`          | string           | no         | Return epics ordered by `created_at` or `updated_at` fields. Default is `created_at`                                        |
 | `sort`              | string           | no         | Return epics sorted in `asc` or `desc` order. Default is `desc`                                                             |
 | `search`            | string           | no         | Search epics against their `title` and `description`                                                                        |
diff --git a/doc/api/group_labels.md b/doc/api/group_labels.md
index f3c3a821354..f41f3a0a402 100644
--- a/doc/api/group_labels.md
+++ b/doc/api/group_labels.md
@@ -4,6 +4,9 @@
 
 This API supports managing of [group labels](../user/project/labels.md#project-labels-and-group-labels). It allows to list, create, update, and delete group labels. Furthermore, users can subscribe and unsubscribe to and from group labels.
 
+NOTE: **Note:**
+The `description_html` - was added to response JSON in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413).
+
 ## List group labels
 
 Get all labels for a given group.
@@ -32,6 +35,7 @@ Example response:
     "color": "#FF0000",
     "text_color" : "#FFFFFF",
     "description": null,
+    "description_html": null,
     "open_issues_count": 0,
     "closed_issues_count": 0,
     "open_merge_requests_count": 0,
@@ -43,6 +47,7 @@ Example response:
     "color": "#228B22",
     "text_color" : "#FFFFFF",
     "description": null,
+    "description_html": null,
     "open_issues_count": 0,
     "closed_issues_count": 0,
     "open_merge_requests_count": 0,
@@ -78,6 +83,7 @@ Example response:
   "color": "#FF0000",
   "text_color" : "#FFFFFF",
   "description": null,
+  "description_html": null,
   "open_issues_count": 0,
   "closed_issues_count": 0,
   "open_merge_requests_count": 0,
@@ -113,6 +119,7 @@ Example response:
   "color": "#FFA500",
   "text_color" : "#FFFFFF",
   "description": "Describes new ideas",
+  "description_html": "Describes new ideas",
   "open_issues_count": 0,
   "closed_issues_count": 0,
   "open_merge_requests_count": 0,
@@ -149,6 +156,7 @@ Example response:
   "color": "#FFA500",
   "text_color" : "#FFFFFF",
   "description": "Describes new ideas",
+  "description_html": "Describes new ideas",
   "open_issues_count": 0,
   "closed_issues_count": 0,
   "open_merge_requests_count": 0,
@@ -204,6 +212,7 @@ Example response:
   "color": "#FFA500",
   "text_color" : "#FFFFFF",
   "description": "Describes new ideas",
+  "description_html": "Describes new ideas",
   "open_issues_count": 0,
   "closed_issues_count": 0,
   "open_merge_requests_count": 0,
@@ -239,6 +248,7 @@ Example response:
   "color": "#FFA500",
   "text_color" : "#FFFFFF",
   "description": "Describes new ideas",
+  "description_html": "Describes new ideas",
   "open_issues_count": 0,
   "closed_issues_count": 0,
   "open_merge_requests_count": 0,
diff --git a/doc/api/issues.md b/doc/api/issues.md
index 383d190a045..3c28b55d1d6 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -47,7 +47,7 @@ GET /issues?confidential=true
 | ------------------- | ---------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `state`             | string           | no         | Return `all` issues or just those that are `opened` or `closed`                                                                                       |
 | `labels`            | string           | no         | Comma-separated list of label names, issues must have all labels to be returned. `None` lists all issues with no labels. `Any` lists all issues with at least one label. `No+Label` (Deprecated) lists all issues with no labels. Predefined names are case-insensitive. |
-| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:text_color`. Default is `false`. |
+| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:description_html`, `:text_color`. Default is `false`. The `description_html` attribute was introduced in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413)|
 | `milestone`         | string           | no         | The milestone title. `None` lists all issues with no milestone. `Any` lists all issues that have an assigned milestone.                             |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`. Defaults to `created_by_me`<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id`. Mutually exclusive with `author_username`. Combine with `scope=all` or `scope=assigned_to_me`. _([Introduced][ce-13004] in GitLab 9.5)_ |
@@ -203,7 +203,7 @@ GET /groups/:id/issues?confidential=true
 | `id`                | integer/string   | yes        | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user                 |
 | `state`             | string           | no         | Return all issues or just those that are `opened` or `closed`                                                                 |
 | `labels`            | string           | no         | Comma-separated list of label names, issues must have all labels to be returned. `None` lists all issues with no labels. `Any` lists all issues with at least one label. `No+Label` (Deprecated) lists all issues with no labels. Predefined names are case-insensitive. |
-| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:text_color`. Default is `false`. |
+| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:description_html`, `:text_color`. Default is `false`. The `description_html` attribute was introduced in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413) |
 | `iids[]`            | integer array    | no         | Return only the issues having the given `iid`                                                                                 |
 | `milestone`         | string           | no         | The milestone title. `None` lists all issues with no milestone. `Any` lists all issues that have an assigned milestone.       |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
@@ -358,7 +358,7 @@ GET /projects/:id/issues?confidential=true
 | `iids[]`            | integer array    | no         | Return only the milestone having the given `iid`                                                                              |
 | `state`             | string           | no         | Return all issues or just those that are `opened` or `closed`                                                                 |
 | `labels`            | string           | no         | Comma-separated list of label names, issues must have all labels to be returned. `None` lists all issues with no labels. `Any` lists all issues with at least one label. `No+Label` (Deprecated) lists all issues with no labels. Predefined names are case-insensitive. |
-| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:text_color`. Default is `false`. |
+| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:description_html`, `:text_color`. Default is `false`. `description_html` Introduced in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413) |
 | `milestone`         | string           | no         | The milestone title. `None` lists all issues with no milestone. `Any` lists all issues that have an assigned milestone.       |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id`. Mutually exclusive with `author_username`. Combine with `scope=all` or `scope=assigned_to_me`. _([Introduced][ce-13004] in GitLab 9.5)_ |
diff --git a/doc/api/labels.md b/doc/api/labels.md
index 525dbe02e5f..ac5156e8c20 100644
--- a/doc/api/labels.md
+++ b/doc/api/labels.md
@@ -1,5 +1,8 @@
 # Labels API
 
+NOTE: **Note:**
+The `description_html` - was added to response JSON in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413).
+
 ## List labels
 
 Get all labels for a given project.
@@ -28,6 +31,7 @@ Example response:
     "color" : "#d9534f",
     "text_color" : "#FFFFFF",
     "description": "Bug reported by user",
+    "description_html": "Bug reported by user",
     "open_issues_count": 1,
     "closed_issues_count": 0,
     "open_merge_requests_count": 1,
@@ -41,6 +45,7 @@ Example response:
     "text_color" : "#FFFFFF",
     "name" : "confirmed",
     "description": "Confirmed issue",
+    "description_html": "Confirmed issue",
     "open_issues_count": 2,
     "closed_issues_count": 5,
     "open_merge_requests_count": 0,
@@ -54,6 +59,7 @@ Example response:
     "color" : "#d9534f",
     "text_color" : "#FFFFFF",
     "description": "Critical issue. Need fix ASAP",
+    "description_html": "Critical issue. Need fix ASAP",
     "open_issues_count": 1,
     "closed_issues_count": 3,
     "open_merge_requests_count": 1,
@@ -67,6 +73,7 @@ Example response:
     "color" : "#f0ad4e",
     "text_color" : "#FFFFFF",
     "description": "Issue about documentation",
+    "description_html": "Issue about documentation",
     "open_issues_count": 1,
     "closed_issues_count": 0,
     "open_merge_requests_count": 2,
@@ -80,6 +87,7 @@ Example response:
     "text_color" : "#FFFFFF",
     "name" : "enhancement",
     "description": "Enhancement proposal",
+    "description_html": "Enhancement proposal",
     "open_issues_count": 1,
     "closed_issues_count": 0,
     "open_merge_requests_count": 1,
@@ -117,6 +125,7 @@ Example response:
   "color" : "#d9534f",
   "text_color" : "#FFFFFF",
   "description": "Bug reported by user",
+  "description_html": "Bug reported by user",
   "open_issues_count": 1,
   "closed_issues_count": 0,
   "open_merge_requests_count": 1,
@@ -155,6 +164,7 @@ Example response:
   "color" : "#5843AD",
   "text_color" : "#FFFFFF",
   "description":null,
+  "description_html":null,
   "open_issues_count": 0,
   "closed_issues_count": 0,
   "open_merge_requests_count": 0,
@@ -214,6 +224,7 @@ Example response:
   "color" : "#8E44AD",
   "text_color" : "#FFFFFF",
   "description": "Documentation",
+  "description_html": "Documentation",
   "open_issues_count": 1,
   "closed_issues_count": 0,
   "open_merge_requests_count": 2,
@@ -252,6 +263,7 @@ Example response:
   "name" : "documentation",
   "color" : "#8E44AD",
   "description": "Documentation",
+  "description_html": "Documentation",
   "open_issues_count": 1,
   "closed_issues_count": 0,
   "open_merge_requests_count": 2,
@@ -289,6 +301,7 @@ Example response:
   "color" : "#d9534f",
   "text_color" : "#FFFFFF",
   "description": "Bug reported by user",
+  "description_html": "Bug reported by user",
   "open_issues_count": 1,
   "closed_issues_count": 0,
   "open_merge_requests_count": 1,
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index d17db8deeb2..c722c966273 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -45,6 +45,7 @@ Parameters:
 | `milestone`         | string         | no       | Return merge requests for a specific milestone. `None` returns merge requests with no milestone. `Any` returns merge requests that have an assigned milestone. |
 | `view`              | string         | no       | If `simple`, returns the `iid`, URL, title, description, and basic state of merge request                              |
 | `labels`            | string         | no       | Return merge requests matching a comma separated list of labels. `None` lists all merge requests with no labels. `Any` lists all merge requests with at least one label. `No+Label` (Deprecated) lists all merge requests with no labels. Predefined names are case-insensitive. |
+| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:description_html`, `:text_color`. Default is `false`. Introduced in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413) |
 | `created_after`     | datetime       | no       | Return merge requests created on or after the given time                                                               |
 | `created_before`    | datetime       | no       | Return merge requests created on or before the given time                                                              |
 | `updated_after`     | datetime       | no       | Return merge requests updated on or after the given time                                                               |
@@ -213,6 +214,7 @@ Parameters:
 | `milestone`         | string         | no       | Return merge requests for a specific milestone. `None` returns merge requests with no milestone. `Any` returns merge requests that have an assigned milestone. |
 | `view`              | string         | no       | If `simple`, returns the `iid`, URL, title, description, and basic state of merge request                                      |
 | `labels`            | string         | no       | Return merge requests matching a comma separated list of labels. `None` lists all merge requests with no labels. `Any` lists all merge requests with at least one label. `No+Label` (Deprecated) lists all merge requests with no labels. Predefined names are case-insensitive. |
+| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:description_html`, `:text_color`. Default is `false`. Introduced in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413) |
 | `created_after`     | datetime       | no       | Return merge requests created on or after the given time                                                                       |
 | `created_before`    | datetime       | no       | Return merge requests created on or before the given time                                                                      |
 | `updated_after`     | datetime       | no       | Return merge requests updated on or after the given time                                                                       |
@@ -373,6 +375,7 @@ Parameters:
 | `milestone`         | string         | no       | Return merge requests for a specific milestone. `None` returns merge requests with no milestone. `Any` returns merge requests that have an assigned milestone. |
 | `view`              | string         | no       | If `simple`, returns the `iid`, URL, title, description, and basic state of merge request                                      |
 | `labels`            | string         | no       | Return merge requests matching a comma separated list of labels. `None` lists all merge requests with no labels. `Any` lists all merge requests with at least one label. `No+Label` (Deprecated) lists all merge requests with no labels. Predefined names are case-insensitive. |
+| `with_labels_details` | Boolean        | no         | If `true`, response will return more details for each label in labels field: `:name`, `:color`, `:description`, `:description_html`, `:text_color`. Default is `false`. Introduced in [GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/merge_requests/21413)|
 | `created_after`     | datetime       | no       | Return merge requests created on or after the given time                                                                       |
 | `created_before`    | datetime       | no       | Return merge requests created on or before the given time                                                                      |
 | `updated_after`     | datetime       | no       | Return merge requests updated on or after the given time                                                                       |