diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 21:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 21:09:21 +0300 |
| commit | 43e3dc2f95a25c600e08f65d4f1c406a1a63ed3d (patch) | |
| tree | db5c72020c7c8916020c8aff7c1b7128028d650b /doc/api | |
| parent | 2c89e169769ead722394a79ed67fcd08e96863dd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 12 | ||||
| -rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 30 | ||||
| -rw-r--r-- | doc/api/graphql/reference/index.md | 4 |
3 files changed, 23 insertions, 23 deletions
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index 399ae43c9d0..ecf34b14aa0 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -6758,11 +6758,6 @@ type SnippetBlob { binary: Boolean! """ - Blob highlighted data - """ - highlightedData: String - - """ Blob mode """ mode: String @@ -6780,7 +6775,7 @@ type SnippetBlob { """ Blob plain highlighted data """ - plainHighlightedData: String + plainData: String """ Blob raw content endpoint path @@ -6788,6 +6783,11 @@ type SnippetBlob { rawPath: String! """ + Blob highlighted data + """ + richData: String + + """ Blob content rich viewer """ richViewer: SnippetBlobViewer diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index 99db9539688..33252993682 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -7557,20 +7557,6 @@ "deprecationReason": null }, { - "name": "highlightedData", - "description": "Blob highlighted data", - "args": [ - - ], - "type": { - "kind": "SCALAR", - "name": "String", - "ofType": null - }, - "isDeprecated": false, - "deprecationReason": null - }, - { "name": "mode", "description": "Blob mode", "args": [ @@ -7613,7 +7599,7 @@ "deprecationReason": null }, { - "name": "plainHighlightedData", + "name": "plainData", "description": "Blob plain highlighted data", "args": [ @@ -7645,6 +7631,20 @@ "deprecationReason": null }, { + "name": "richData", + "description": "Blob highlighted data", + "args": [ + + ], + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, + { "name": "richViewer", "description": "Blob content rich viewer", "args": [ diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 55b22d22337..43e7aef59e8 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -1067,12 +1067,12 @@ Represents the snippet blob | Name | Type | Description | | --- | ---- | ---------- | | `binary` | Boolean! | Shows whether the blob is binary | -| `highlightedData` | String | Blob highlighted data | | `mode` | String | Blob mode | | `name` | String | Blob name | | `path` | String | Blob path | -| `plainHighlightedData` | String | Blob plain highlighted data | +| `plainData` | String | Blob plain highlighted data | | `rawPath` | String! | Blob raw content endpoint path | +| `richData` | String | Blob highlighted data | | `richViewer` | SnippetBlobViewer | Blob content rich viewer | | `simpleViewer` | SnippetBlobViewer! | Blob content simple viewer | | `size` | Int! | Blob size | |