diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 16:31:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 16:31:50 +0300 |
commit | 1e8ef329735f06d3b3cfe1966b79fe55eff21f30 (patch) | |
tree | 0c03cc2618813b9eafafd2289cfbac16fd2c2766 /doc | |
parent | efed756aa7fbe80f589edb613eda69f6c7a9a47a (diff) |
Add latest changes from gitlab-org/security/gitlab@12-7-stable-ee
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 4 | ||||
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 6 | ||||
-rw-r--r-- | doc/api/graphql/reference/index.md | 2 | ||||
-rw-r--r-- | doc/user/asciidoc.md | 5 |
4 files changed, 11 insertions, 6 deletions
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index 23ffae3b097..0884f8948f0 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -2414,9 +2414,9 @@ type GrafanaIntegration { id: ID! """ - API token for the Grafana integration + API token for the Grafana integration. Field is permanently masked. """ - token: String! + token: String! @deprecated(reason: "Plain text token has been masked for security reasons") """ Timestamp of the issue's last activity diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index 6239a398c7e..b1617edbfbb 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -16249,7 +16249,7 @@ }, { "name": "token", - "description": "API token for the Grafana integration", + "description": "API token for the Grafana integration. Field is permanently masked.", "args": [ ], @@ -16262,8 +16262,8 @@ "ofType": null } }, - "isDeprecated": false, - "deprecationReason": null + "isDeprecated": true, + "deprecationReason": "Plain text token has been masked for security reasons" }, { "name": "updatedAt", diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 72fc82444ca..5adc68209b0 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -370,10 +370,10 @@ Autogenerated return type of EpicTreeReorder | --- | ---- | ---------- | | `id` | ID! | Internal ID of the Grafana integration | | `grafanaUrl` | String! | Url for the Grafana host for the Grafana integration | -| `token` | String! | API token for the Grafana integration | | `enabled` | Boolean! | Indicates whether Grafana integration is enabled | | `createdAt` | Time! | Timestamp of the issue's creation | | `updatedAt` | Time! | Timestamp of the issue's last activity | +| `token` | String! | API token for the Grafana integration. Field is permanently masked. | ## Group diff --git a/doc/user/asciidoc.md b/doc/user/asciidoc.md index b4d3cb58e97..da6bf287955 100644 --- a/doc/user/asciidoc.md +++ b/doc/user/asciidoc.md @@ -221,6 +221,11 @@ include::basics.adoc[] include::https://example.org/installation.adoc[] ``` +To guarantee good system performance and prevent malicious documents causing +problems, GitLab enforces a **maximum limit** on the number of include directives +processed in any one document. Currently a total of 32 documents can be +included, a number that is inclusive of transitive dependencies. + ### Blocks ```asciidoc |