summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-11-30 12:56:32 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-11-30 12:56:32 +0000
commit8909cf40aa4d9d5bd335a68f873dea4bed31d917 (patch)
treeeba725a6243f3c8095e214c433f7d2dc1ac622c6
parent24790d3bb1577055f33bd95d321c95ee1428d113 (diff)
parent9c4c944636cb1608270e68ff646348d8d7264d1f (diff)
downloadgitlab-ce-8909cf40aa4d9d5bd335a68f873dea4bed31d917.tar.gz
Merge branch 'if-40385_fix_doc' into 'master'
Improve wording on disabling impersonation in api/README See merge request gitlab-org/gitlab-ce!23472
-rw-r--r--doc/api/README.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/api/README.md b/doc/api/README.md
index 848a6e6b72b..b49c3a198f1 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -230,8 +230,7 @@ Impersonation tokens are used exactly like regular personal access tokens, and c
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/40385) in GitLab
11.6.
-By default, impersonation is enabled. To disable impersonation, GitLab must be
-reconfigured:
+By default, impersonation is enabled. To disable impersonation:
**For Omnibus installations**
@@ -577,7 +576,7 @@ When you try to access an API URL that does not exist you will receive 404 Not F
```
HTTP/1.1 404 Not Found
Content-Type: application/json
-{ f
+{
"error": "404 Not Found"
}
```