diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 18:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 18:08:46 +0000 |
| commit | 63a015fd85ae35634eb882d0078e65d80300816c (patch) | |
| tree | 317928bc138d54e28980962e813004876398a7ac /doc | |
| parent | 55693cc1ec8ac79444bc7214d2812a4ac41bf043 (diff) | |
| download | gitlab-ce-63a015fd85ae35634eb882d0078e65d80300816c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 5 | ||||
| -rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 14 | ||||
| -rw-r--r-- | doc/api/graphql/reference/index.md | 1 | ||||
| -rw-r--r-- | doc/development/api_styleguide.md | 2 |
4 files changed, 21 insertions, 1 deletions
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index eb728233379..2c63ecfe08e 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -6642,6 +6642,11 @@ type SnippetBlob { highlightedData: String """ + Blob mode + """ + mode: String + + """ Blob name """ name: String diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index d346c8a886f..a35bf8caccf 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -7172,6 +7172,20 @@ "deprecationReason": null }, { + "name": "mode", + "description": "Blob mode", + "args": [ + + ], + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, + { "name": "name", "description": "Blob name", "args": [ diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 7360ce0978a..a0d1787e816 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -1063,6 +1063,7 @@ Represents the snippet blob | --- | ---- | ---------- | | `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 | | `rawPath` | String! | Blob raw content endpoint path | diff --git a/doc/development/api_styleguide.md b/doc/development/api_styleguide.md index d5fc24c1ddb..2510358b4d5 100644 --- a/doc/development/api_styleguide.md +++ b/doc/development/api_styleguide.md @@ -19,7 +19,7 @@ for a good example): - `desc` for the method summary. You should pass it a block for additional details such as: - - The GitLab version when the endpoint was added + - The GitLab version when the endpoint was added. If it is behind a feature flag, mention that instead: _This feature is gated by the :feature\_flag\_symbol feature flag._ - If the endpoint is deprecated, and if so, when will it be removed - `params` for the method params. This acts as description, |