kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'"

Browse source 
This reverts merge request !21341
This commit is contained in:
Dmitriy Zaporozhets 2018-09-13 15:04:47 +00:00
parent 733cae7022
commit 4c9e53a490
2 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/clusters/applications/jupyter.rb
View file

@ -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

9
spec/models/clusters/applications/jupyter_spec.rb
View file

@ -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