diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-11 10:23:23 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-11 10:23:23 +0000 |
commit | f07a7993e48f758fbe805bc50c631e4cba793205 (patch) | |
tree | 4cf4a9896ea00aff2ccd4daf418ba08cb1b5ddb9 | |
parent | 667005d5ac72698503911c997fb3257e509147b5 (diff) | |
parent | 62e130657bf05c048e180c991c8774200674860a (diff) | |
download | gitlab-ce-f07a7993e48f758fbe805bc50c631e4cba793205.tar.gz |
Merge branch 'master' into 'master'
Update README.md with Authentication projects example
See merge request !11162
-rw-r--r-- | doc/api/README.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/api/README.md b/doc/api/README.md index d444ce94573..1b0f6470b13 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -61,8 +61,9 @@ The following documentation is for the [internal CI API](ci/README.md): ## Authentication -All API requests require authentication via a session cookie or token. There are -three types of tokens available: private tokens, OAuth 2 tokens, and personal +Most API requests require authentication via a session cookie or token. For those cases where it is not required, this will be mentioned in the documentation +for each individual endpoint. For example, the [`/projects/:id` endpoint](projects.md). +There are three types of tokens available: private tokens, OAuth 2 tokens, and personal access tokens. If authentication information is invalid or omitted, an error message will be |