diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-16 18:09:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-16 18:09:47 +0000 |
commit | bf1600d157465f9408aace91073954fd5790c054 (patch) | |
tree | f317bb99330769c4eb37621c860af014810e554b /doc/user/profile/preferences.md | |
parent | 6de7d2c195a8a7fa5702cafa4365f7a9fcac37cd (diff) | |
download | gitlab-ce-bf1600d157465f9408aace91073954fd5790c054.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/profile/preferences.md')
-rw-r--r-- | doc/user/profile/preferences.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md index 03bb1bf677e..f84fc1ae898 100644 --- a/doc/user/profile/preferences.md +++ b/doc/user/profile/preferences.md @@ -182,6 +182,12 @@ Manage the availability of integrated code intelligence features powered by Sourcegraph. View [the Sourcegraph feature documentation](../../integration/sourcegraph.md#enable-sourcegraph-in-user-preferences) for more information. +### Gitpod + +Enable and disable the [GitLab-Gitpod integration](../../integration/gitpod.md). This is only +visible after the integration is configured by a GitLab administrator. View +[the Gitpod feature documentation](../../integration/gitpod.md) for more information. + <!-- ## Troubleshooting Include any troubleshooting steps that you can foresee. If you know beforehand what issues |