diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-06-25 23:07:17 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-25 23:07:17 +0000 |
| commit | 4633df7b9e756ae50f35246e9ba93e1c3ca1e01a (patch) | |
| tree | 71564f0bb36ccc5c7b022e6c42ff917abb8eb807 | |
| parent | 55af6a19e506eb74e1763e3c84da94726c9092d2 (diff) | |
| parent | 839660bee00998a29a644e279648586f9f47ce1f (diff) | |
| download | gitlab-ce-4633df7b9e756ae50f35246e9ba93e1c3ca1e01a.tar.gz | |
Merge branch 'fix/jupyter-git-v3' into 'master'
Fix Jupyter-Git integration
See merge request gitlab-org/gitlab-ce!30020
| -rw-r--r-- | changelogs/unreleased/fix-jupyter-git-v3.yml | 5 | ||||
| -rw-r--r-- | vendor/jupyter/values.yaml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-jupyter-git-v3.yml b/changelogs/unreleased/fix-jupyter-git-v3.yml new file mode 100644 index 00000000000..8aaaaf249fb --- /dev/null +++ b/changelogs/unreleased/fix-jupyter-git-v3.yml @@ -0,0 +1,5 @@ +--- +title: Fix Jupyter-Git integration +merge_request: 30020 +author: Amit Rathi +type: fixed diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml index 0fbf36b39cc..2aadd3dbe1e 100644 --- a/vendor/jupyter/values.yaml +++ b/vendor/jupyter/values.yaml @@ -46,7 +46,7 @@ singleuser: - "-c" - > git clone https://gitlab.com/gitlab-org/nurtch-demo.git DevOps-Runbook-Demo || true; - echo "https://${GITLAB_USER_LOGIN}:${GITLAB_ACCESS_TOKEN}@${GITLAB_HOST}" > ~/.git-credentials; + echo "https://oauth2:${GITLAB_ACCESS_TOKEN}@${GITLAB_HOST}" > ~/.git-credentials; git config --global credential.helper store; git config --global user.email "${GITLAB_USER_EMAIL}"; git config --global user.name "${GITLAB_USER_NAME}"; |