Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 28 insertions, 21 deletions

diff --git a/doc/api/discussions.md b/doc/api/discussions.md
index f1e8965b336..572e174201d 100644
--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -739,7 +739,7 @@ GET /projects/:id/merge_requests/:merge_request_iid/discussions
 ]
 ```
 
-Diff comments contain also position:
+Diff comments also contain position:
 
 ```json
 [
@@ -774,7 +774,11 @@ Diff comments contain also position:
           "new_path": "package.json",
           "position_type": "text",
           "old_line": 27,
-          "new_line": 27
+          "new_line": 27,
+          "line_range": {
+            "start_line_code": "588440f66559714280628a4f9799f0c4eb880a4a_10_10",
+            "end_line_code": "588440f66559714280628a4f9799f0c4eb880a4a_11_11"
+          }
         },
         "resolved": false,
         "resolvable": true,
@@ -820,25 +824,28 @@ POST /projects/:id/merge_requests/:merge_request_iid/discussions
 
 Parameters:
 
-| Attribute                 | Type           | Required | Description |
-| ------------------------- | -------------- | -------- | ----------- |
-| `id`                      | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
-| `merge_request_iid`       | integer        | yes      | The IID of a merge request |
-| `body`                    | string         | yes      | The content of the thread |
-| `created_at`              | string         | no       | Date time string, ISO 8601 formatted, e.g. 2016-03-11T03:45:40Z (requires admin or project/group owner rights) |
-| `position`                | hash           | no       | Position when creating a diff note |
-| `position[base_sha]`      | string         | yes      | Base commit SHA in the source branch |
-| `position[start_sha]`     | string         | yes      | SHA referencing commit in target branch |
-| `position[head_sha]`      | string         | yes      | SHA referencing HEAD of this merge request |
-| `position[position_type]` | string         | yes      | Type of the position reference', allowed values: 'text' or 'image' |
-| `position[new_path]`      | string         | no       | File path after change |
-| `position[new_line]`      | integer        | no       | Line number after change (for 'text' diff notes) |
-| `position[old_path]`      | string         | no       | File path before change |
-| `position[old_line]`      | integer        | no       | Line number before change (for 'text' diff notes) |
-| `position[width]`         | integer        | no       | Width of the image (for 'image' diff notes) |
-| `position[height]`        | integer        | no       | Height of the image (for 'image' diff notes) |
-| `position[x]`             | integer        | no       | X coordinate (for 'image' diff notes) |
-| `position[y]`             | integer        | no       | Y coordinate (for 'image' diff notes) |
+| Attribute                               | Type           | Required | Description |
+| --------------------------------------- | -------------- | -------- | ----------- |
+| `id`                                    | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
+| `merge_request_iid`                     | integer        | yes      | The IID of a merge request |
+| `body`                                  | string         | yes      | The content of the thread |
+| `created_at`                            | string         | no       | Date time string, ISO 8601 formatted, e.g. 2016-03-11T03:45:40Z (requires admin or project/group owner rights) |
+| `position`                              | hash           | no       | Position when creating a diff note |
+| `position[base_sha]`                    | string         | yes      | Base commit SHA in the source branch |
+| `position[start_sha]`                   | string         | yes      | SHA referencing commit in target branch |
+| `position[head_sha]`                    | string         | yes      | SHA referencing HEAD of this merge request |
+| `position[position_type]`               | string         | yes      | Type of the position reference', allowed values: 'text' or 'image' |
+| `position[new_path]`                    | string         | no       | File path after change |
+| `position[new_line]`                    | integer        | no       | Line number after change (for 'text' diff notes) |
+| `position[old_path]`                    | string         | no       | File path before change |
+| `position[old_line]`                    | integer        | no       | Line number before change (for 'text' diff notes) |
+| `position[line_range]`                  | hash           | no       | Line range for a multi-line diff note |
+| `position[line_range][start_line_code]` | string         | yes      | Line code for the start line |
+| `position[line_range][end_line_code]`   | string         | yes      | Line code for the end line |
+| `position[width]`                       | integer        | no       | Width of the image (for 'image' diff notes) |
+| `position[height]`                      | integer        | no       | Height of the image (for 'image' diff notes) |
+| `position[x]`                           | integer        | no       | X coordinate (for 'image' diff notes) |
+| `position[y]`                           | integer        | no       | Y coordinate (for 'image' diff notes) |
 
 ```shell
 curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/5/merge_requests/11/discussions?body=comment