diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-03-14 02:27:20 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-03-14 02:27:20 +0000 |
commit | a59b7cee0afc152efba6aa4c430c14c0b038107a (patch) | |
tree | 91329dcabab69f80ae50426b8fba3b253724439b | |
parent | ae8cbffaf1b1738e2d175c15aff1a6718a5f8b06 (diff) | |
parent | 6adca3683fe9d14c51cd7e3e9e667b976f28fc13 (diff) | |
download | gitlab-ce-57493-truncate-user-name-on-project-list.tar.gz |
Merge branch '58927-jupyterhub-fails-to-install' into 'master'57493-truncate-user-name-on-project-list57330-
Fixes jupyter installation randomly failing
Closes #58927
See merge request gitlab-org/gitlab-ce!26126
-rw-r--r-- | changelogs/unreleased/58927-jupyterhub-fails-to-install.yml | 5 | ||||
-rw-r--r-- | vendor/jupyter/values.yaml | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changelogs/unreleased/58927-jupyterhub-fails-to-install.yml b/changelogs/unreleased/58927-jupyterhub-fails-to-install.yml new file mode 100644 index 00000000000..2502b981337 --- /dev/null +++ b/changelogs/unreleased/58927-jupyterhub-fails-to-install.yml @@ -0,0 +1,5 @@ +--- +title: Fixes jupyter installation randomly failing +merge_request: 26126 +author: +type: fixed diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml index 781d6e3042f..2be54dec30e 100644 --- a/vendor/jupyter/values.yaml +++ b/vendor/jupyter/values.yaml @@ -23,3 +23,7 @@ ingress: annotations: kubernetes.io/ingress.class: "nginx" kubernetes.io/tls-acme: "true" + +prePuller: + hook: + enabled: false |