Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 00:09:22 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 00:09:22 +0300
commit27d314277bfe7fffec215efa9b1833a23bb82940 (patch)
tree898c606409718e70579beea62174624f84e28629 /doc
parent6b9d3a4e8351e662c4586b24bb152de78ae9e3bf (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/README.md2
-rw-r--r--doc/user/project/repository/index.md12
-rw-r--r--doc/user/project/repository/jupyter_notebooks/img/jupyter_notebook.png (renamed from doc/user/project/repository/img/jupyter_notebook.png)bin63326 -> 63326 bytes
-rw-r--r--doc/user/project/repository/jupyter_notebooks/index.md23
4 files changed, 26 insertions, 11 deletions
diff --git a/doc/README.md b/doc/README.md
index c3db960514f..201a2b57fbd 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -174,7 +174,7 @@ The following documentation relates to the DevOps **Create** stage:
| [Delete merged branches](user/project/repository/branches/index.md#delete-merged-branches) | Bulk delete branches after their changes are merged. |
| [File templates](user/project/repository/web_editor.md#template-dropdowns) | File templates for common files. |
| [Files](user/project/repository/index.md#files) | Files management. |
-| [Jupyter Notebook files](user/project/repository/index.md#jupyter-notebook-files) | GitLab's support for `.ipynb` files. |
+| [Jupyter Notebook files](user/project/repository/jupyter_notebooks/index.md#jupyter-notebook-files) | GitLab's support for `.ipynb` files. |
| [Protected branches](user/project/protected_branches.md) | Use protected branches. |
| [Push rules](push_rules/push_rules.md) **(STARTER)** | Additional control over pushes to your projects. |
| [Repositories](user/project/repository/index.md) | Manage source code repositories in GitLab's user interface. |
diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md
index fad8cbe81cb..8be7320dcb9 100644
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -102,19 +102,11 @@ Some things to note about precedence:
### Jupyter Notebook files
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/2508) in GitLab 9.1
-
-[Jupyter](https://jupyter.org) Notebook (previously IPython Notebook) files are used for
+[Jupyter](https://jupyter.org/) Notebook (previously IPython Notebook) files are used for
interactive computing in many fields and contain a complete record of the
user's sessions and include code, narrative text, equations and rich output.
-When added to a repository, Jupyter Notebooks with a `.ipynb` extension will be
-rendered to HTML when viewed.
-
-![Jupyter Notebook Rich Output](img/jupyter_notebook.png)
-
-Interactive features, including JavaScript plots, will not work when viewed in
-GitLab.
+[Read how to use Jupyter notebooks with GitLab.](jupyter_notebooks/index.md)
### OpenAPI viewer
diff --git a/doc/user/project/repository/img/jupyter_notebook.png b/doc/user/project/repository/jupyter_notebooks/img/jupyter_notebook.png
index 52c5c5aea32..52c5c5aea32 100644
--- a/doc/user/project/repository/img/jupyter_notebook.png
+++ b/doc/user/project/repository/jupyter_notebooks/img/jupyter_notebook.png
Binary files differ
diff --git a/doc/user/project/repository/jupyter_notebooks/index.md b/doc/user/project/repository/jupyter_notebooks/index.md
new file mode 100644
index 00000000000..6b93ee05a9b
--- /dev/null
+++ b/doc/user/project/repository/jupyter_notebooks/index.md
@@ -0,0 +1,23 @@
+# Jupyter Notebook Files
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/2508/) in GitLab 9.1.
+
+[Jupyter](https://jupyter.org/) Notebook (previously IPython Notebook) files are used for
+interactive computing in many fields and contain a complete record of the
+user's sessions and include code, narrative text, equations and rich output.
+
+When added to a repository, Jupyter Notebooks with a `.ipynb` extension will be
+rendered to HTML when viewed.
+
+![Jupyter Notebook Rich Output](img/jupyter_notebook.png)
+
+Interactive features, including JavaScript plots, will not work when viewed in
+GitLab.
+
+## Jupyter Hub as a GitLab Managed App
+
+You can deploy [Jupyter Hub as a GitLab managed app](./../../../clusters/applications.md#jupyterhub).
+
+## Jupyter Git integration
+
+Find out how to [leverage JupyterLab’s Git extension on your Kubernetes cluster](./../../../clusters/applications.md#jupyter-git-integration).