summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-09-09 01:52:15 +0000
committerEvan Read <eread@gitlab.com>2019-09-09 01:52:15 +0000
commitf1d5f0ef0261e28269076d071748539bd0eb5e69 (patch)
tree340aac2fdd2aba91834a2a61a2f437e763b62b19
parente65ddd83cc2372e5c35eeefc8383e80c95984719 (diff)
parent10cc4380df925e0bf9ed1e5902d24603d5e195b5 (diff)
downloadgitlab-ce-f1d5f0ef0261e28269076d071748539bd0eb5e69.tar.gz
Merge branch 'docs-group-level-jupyterhub' into 'master'
Document JupyterHub is available for group-level clusters See merge request gitlab-org/gitlab-ce!32718
-rw-r--r--doc/user/clusters/applications.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index f922b8911ae..65b654d1553 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -129,7 +129,8 @@ file.
### JupyterHub
-> Available for project-level clusters since GitLab 11.0.
+> - Available for project-level clusters since GitLab 11.0.
+> - Available for group-level clusters since GitLab 12.3.
[JupyterHub](https://jupyterhub.readthedocs.io/en/stable/) is a
multi-user service for managing notebooks across a team. [Jupyter
@@ -138,8 +139,9 @@ web-based interactive programming environment used for data analysis,
visualization, and machine learning.
Authentication will be enabled only for [project
-members](../project/members/index.md) with [Developer or
-higher](../permissions.md) access to the project.
+members](../project/members/index.md) for project-level clusters and group
+members for group-level clusters with [Developer or
+higher](../permissions.md) access to the associated project or group.
We use a [custom Jupyter
image](https://gitlab.com/gitlab-org/jupyterhub-user-image/blob/master/Dockerfile)