diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
| commit | 0efbc126d080892214d312a3ae2549f1fc341cb6 (patch) | |
| tree | b7131288bcbc3c5b0160ad55ed4b95523ce71c12 /doc/user/profile/personal_access_tokens.md | |
| parent | 46e3ad4b948dedf67245708493ee17c4429f8bf3 (diff) | |
| parent | 679c0048a8f679aad456c02e30486150bbd0d93d (diff) | |
| download | gitlab-ce-0efbc126d080892214d312a3ae2549f1fc341cb6.tar.gz | |
Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4
# Conflicts:
# app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
Diffstat (limited to 'doc/user/profile/personal_access_tokens.md')
| -rw-r--r-- | doc/user/profile/personal_access_tokens.md | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md index 25d6c34409c..7d55048c994 100644 --- a/doc/user/profile/personal_access_tokens.md +++ b/doc/user/profile/personal_access_tokens.md @@ -45,16 +45,14 @@ the following table. | Scope | Description | | ----- | ----------- | |`read_user` | Allows access to the read-only endpoints under `/users`. Essentially, any of the `GET` requests in the [Users API][users] are allowed ([introduced][ce-5951] in GitLab 8.15). | -| `api` | Grants complete access to the API (read/write) ([introduced][ce-5951] in GitLab 8.15). Required for accessing Git repositories over HTTP when 2FA is enabled. | -| `read_registry` | Allows to read [container registry] images if a project is private and authorization is required ([introduced][ce-11845] in GitLab 9.3). | +| `api` | Grants complete access to the API and Container Registry (read/write) ([introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5951) in GitLab 8.15). Required for accessing Git repositories over HTTP when 2FA is enabled. | +| `read_registry` | Allows to read (pull) [container registry] images if a project is private and authorization is required ([introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11845) in GitLab 9.3). | | `sudo` | Allows performing API actions as any user in the system (if the authenticated user is an admin) ([introduced][ce-14838] in GitLab 10.2). | -| `read_repository` | Allows read-access to the repository through git clone. | +| `read_repository` | Allows read-access (pull) to the repository through git clone. | [2fa]: ../account/two_factor_authentication.md [api]: ../../api/README.md [ce-3749]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3749 -[ce-5951]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5951 -[ce-11845]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11845 [ce-14838]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14838 [container registry]: ../project/container_registry.md [users]: ../../api/users.md |