Merge branch 'revert-f87809f7' into 'master'

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

See merge request gitlab-org/gitlab-ce!21722

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

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