diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-13 18:04:47 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-13 19:47:56 +0300 |
commit | 4c9e53a490d6630c911daf4b52096a4d0137ca95 (patch) | |
tree | 95d4420662d888eef0bb0dc404eb4158070d5d85 | |
parent | 733cae702222771a734db5b3b5ab8fe3e2eb7538 (diff) |
Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'"
This reverts merge request !21341
-rw-r--r-- | app/models/clusters/applications/jupyter.rb | 9 | ||||
-rw-r--r-- | spec/models/clusters/applications/jupyter_spec.rb | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/app/models/clusters/applications/jupyter.rb b/app/models/clusters/applications/jupyter.rb index 2371b0237d8..3d84eeed5a8 100644 --- a/app/models/clusters/applications/jupyter.rb +++ b/app/models/clusters/applications/jupyter.rb @@ -73,19 +73,10 @@ module Clusters "clientSecret" => oauth_application.secret, "callbackUrl" => callback_url } - }, - "singleuser" => { - "extraEnv" => { - "GITLAB_PROJECT_ID" => project_id - } } } end - def project_id - cluster&.project&.id - end - def gitlab_url Gitlab.config.gitlab.url end diff --git a/spec/models/clusters/applications/jupyter_spec.rb b/spec/models/clusters/applications/jupyter_spec.rb index 20e782113ff..591a01d78a9 100644 --- a/spec/models/clusters/applications/jupyter_spec.rb +++ b/spec/models/clusters/applications/jupyter_spec.rb @@ -108,17 +108,8 @@ describe Clusters::Applications::Jupyter do expect(values).to include('rbac') expect(values).to include('proxy') expect(values).to include('auth') - expect(values).to include('singleuser') expect(values).to match(/clientId: '?#{application.oauth_application.uid}/) expect(values).to match(/callbackUrl: '?#{application.callback_url}/) end - - context 'when cluster belongs to a project' do - let(:project) { application.cluster.first_project } - - it 'sets GitLab project id' do - expect(values).to match(/GITLAB_PROJECT_ID: '?#{project.id}/) - end - end end end |