diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-14 18:45:55 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-03-14 18:45:55 +0300 |
| commit | 92b1f1c276f38e3621d42a8c913a51d9391e6d5b (patch) | |
| tree | 495b073ea66714f74021934509235fd2f2675e97 | |
| parent | 7dc3221163a682a4259579cfefa8e0a794eb0e4b (diff) | |
| parent | fa168b5ff179fe469b00bbcf983d0c4152dcd41b (diff) | |
Merge branch 'revert-a59b7cee' into 'master'
Revert "Merge branch '58927-jupyterhub-fails-to-install' into 'master'"
See merge request gitlab-org/gitlab-ce!26174
| -rw-r--r-- | changelogs/unreleased/58927-jupyterhub-fails-to-install.yml | 5 | ||||
| -rw-r--r-- | vendor/jupyter/values.yaml | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/changelogs/unreleased/58927-jupyterhub-fails-to-install.yml b/changelogs/unreleased/58927-jupyterhub-fails-to-install.yml deleted file mode 100644 index 2502b981337..00000000000 --- a/changelogs/unreleased/58927-jupyterhub-fails-to-install.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 2be54dec30e..781d6e3042f 100644 --- a/vendor/jupyter/values.yaml +++ b/vendor/jupyter/values.yaml @@ -23,7 +23,3 @@ ingress: annotations: kubernetes.io/ingress.class: "nginx" kubernetes.io/tls-acme: "true" - -prePuller: - hook: - enabled: false |