From 43e3dc2f95a25c600e08f65d4f1c406a1a63ed3d Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 12 Feb 2020 18:09:21 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 doc/api/graphql/reference/gitlab_schema.graphql | 12 +++++-----
 doc/api/graphql/reference/gitlab_schema.json    | 30 ++++++++++++-------------
 doc/api/graphql/reference/index.md              |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'doc/api')

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
@@ -6757,11 +6757,6 @@ type SnippetBlob {
   """
   binary: Boolean!
 
-  """
-  Blob highlighted data
-  """
-  highlightedData: String
-
   """
   Blob mode
   """
@@ -6780,13 +6775,18 @@ type SnippetBlob {
   """
   Blob plain highlighted data
   """
-  plainHighlightedData: String
+  plainData: String
 
   """
   Blob raw content endpoint path
   """
   rawPath: String!
 
+  """
+  Blob highlighted data
+  """
+  richData: String
+
   """
   Blob content rich viewer
   """
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
@@ -7556,20 +7556,6 @@
               "isDeprecated": false,
               "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",
@@ -7613,7 +7599,7 @@
               "deprecationReason": null
             },
             {
-              "name": "plainHighlightedData",
+              "name": "plainData",
               "description": "Blob plain highlighted data",
               "args": [
 
@@ -7644,6 +7630,20 @@
               "isDeprecated": false,
               "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",
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 |
-- 
cgit v1.2.3