diff options
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/permissions.md | 6 | ||||
| -rw-r--r-- | doc/user/profile/img/personal_access_tokens.png | bin | 0 -> 18553 bytes | |||
| -rw-r--r-- | doc/user/profile/personal_access_tokens.md | 18 | ||||
| -rw-r--r-- | doc/user/project/badges.md | 6 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/merge_when_pipeline_succeeds.md | 2 |
5 files changed, 11 insertions, 21 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 9db1e43fdf2..833b9b66102 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -23,12 +23,6 @@ To add or import a user, you can follow the See our [product handbook on permissions](https://about.gitlab.com/handbook/product#permissions-in-gitlab) -## Instance-wide user permissions - -By default, users can create top-level groups and change their -usernames. A GitLab administrator can configure the GitLab instance to -[modify this behavior](../administration/user_settings.md). - ## Project members permissions NOTE: **Note:** diff --git a/doc/user/profile/img/personal_access_tokens.png b/doc/user/profile/img/personal_access_tokens.png Binary files differnew file mode 100644 index 00000000000..d29f4cb0a20 --- /dev/null +++ b/doc/user/profile/img/personal_access_tokens.png diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md index 3a4d09c35d9..7d55048c994 100644 --- a/doc/user/profile/personal_access_tokens.md +++ b/doc/user/profile/personal_access_tokens.md @@ -20,19 +20,21 @@ at midnight UTC. You can create as many personal access tokens as you like from your GitLab profile. -1. Log in to GitLab. -1. In the upper-right corner, click your avatar and select **Settings**. -1. On the **User Settings** menu, select **Access Tokens**. -1. Choose a name and optional expiry date for the token. +1. Log in to your GitLab account. +1. Go to your **Profile settings**. +1. Go to **Access tokens**. +1. Choose a name and optionally an expiry date for the token. 1. Choose the [desired scopes](#limiting-scopes-of-a-personal-access-token). -1. Click the **Create personal access token** button. +1. Click on **Create personal access token**. 1. Save the personal access token somewhere safe. Once you leave or refresh the page, you won't be able to access it again. -### Revoking a personal access token + -At any time, you can revoke any personal access token by clicking the -respective **Revoke** button under the **Active Personal Access Token** area. +## Revoking a personal access token + +At any time, you can revoke any personal access token by just clicking the +respective **Revoke** button under the 'Active personal access tokens' area. ## Limiting scopes of a personal access token diff --git a/doc/user/project/badges.md b/doc/user/project/badges.md index 025f3af0af5..19eb95099ce 100644 --- a/doc/user/project/badges.md +++ b/doc/user/project/badges.md @@ -63,12 +63,6 @@ are available: - `%{commit_sha}`: ID of the most recent commit to the default branch of a project's repository -NOTE: **NOTE** -Placeholders allow badges to expose otherwise-private information, such as the -default branch or commit SHA when the project is configured to have a private -repository. This is by design, as badges are intended to be used publicly. Avoid -using these placeholders if the information is sensitive. - ## API You can also configure badges via the GitLab API. As in the settings, there is diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md index f8af71ab46b..bdd7d0022e6 100644 --- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md @@ -1,4 +1,4 @@ -# Merge when pipeline succeeds +# Merge When Pipeline Succeeds When reviewing a merge request that looks ready to merge but still has one or more CI jobs running, you can set it to be merged automatically when the |
