Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 23 deletions

diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md
index 53a2fb8bbdd..6950ad38101 100644
--- a/doc/integration/jenkins.md
+++ b/doc/integration/jenkins.md
@@ -33,31 +33,20 @@ The Jenkins integration requires configuration in both GitLab and Jenkins.
 
 ## Grant Jenkins access to the GitLab project
 
-Grant a GitLab user access to the relevant GitLab projects.
+To grant Jenkins access to the GitLab project:
 
-1. Create a new GitLab user, or choose an existing GitLab user.
+1. Create a personal, project, or group access token.
 
-   This account is used by Jenkins to access the GitLab projects. We recommend creating a GitLab
-   user for only this purpose. If you use a person's account, and their account is deactivated or
-   deleted, the Jenkins integration stops working.
+   - [Create a personal access token](../user/profile/personal_access_tokens.md#create-a-personal-access-token)
+     to use the token for all Jenkins integrations of that user.
+   - [Create a project access token](../user/project/settings/project_access_tokens.md#create-a-project-access-token)
+     to use the token at the project level only. For instance, you can revoke
+     the token in a project without affecting Jenkins integrations in other projects.
+   - [Create a group access token](../user/group/settings/group_access_tokens.md#create-a-group-access-token-using-ui)
+     to use the token for all Jenkins integrations in all projects of that group.
 
-1. Grant the user permission to the GitLab projects.
-
-   If you're integrating Jenkins with many GitLab projects, consider granting the
-   user administrator access. Otherwise, add the user to each project
-   and grant the Maintainer role.
-
-## Grant Jenkins access to the GitLab API
-
-Create a personal access token to authorize Jenkins to access GitLab.
-
-1. Sign in to GitLab as the user to be used with Jenkins.
-1. On the top bar, in the top right corner, select your avatar.
-1. Select **Edit profile**.
-1. On the left sidebar, select **Access Tokens**.
-1. Create a [personal access token](../user/profile/personal_access_tokens.md) and
-   select the **API** scope.
-1. Copy the personal access token. You need it to [configure the Jenkins server](#configure-the-jenkins-server).
+1. Set the access token scope to **API**.
+1. Copy the access token value to [configure the Jenkins server](#configure-the-jenkins-server).
 
 ## Configure the Jenkins server
 
@@ -70,7 +59,7 @@ authorize the connection to GitLab.
 1. In the **GitLab** section, select **Enable authentication for '/project' end-point**.
 1. Select **Add**, then choose **Jenkins Credential Provider**.
 1. Select **GitLab API token** as the token type.
-1. Enter the GitLab personal access token's value in **API Token** and select **Add**.
+1. In **API Token**, [paste the value you copied from GitLab](#grant-jenkins-access-to-the-gitlab-project) and select **Add**.
 1. Enter the GitLab server's URL in **GitLab host URL**.
 1. To test the connection, select **Test Connection**.