diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-06-24 05:16:31 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-24 05:16:31 +0000 |
| commit | d9f4a919458721bd9ffae4d4e69bf17d18bd3be8 (patch) | |
| tree | 04fe777f8eb643539cb4eceedeb54cb586947332 /spec/controllers/projects | |
| parent | 833013ba4a855d62cfbc691c3ba95e06876a1634 (diff) | |
| parent | 74702f0e0e05bc346338fbd11b596fcbedfbaea6 (diff) | |
| download | gitlab-ce-d9f4a919458721bd9ffae4d4e69bf17d18bd3be8.tar.gz | |
Merge branch '60617-enable-project-cluster-jit' into 'master'
Enable JIT Kubernetes resource creation for project level clusters
See merge request gitlab-org/gitlab-ce!29515
Diffstat (limited to 'spec/controllers/projects')
| -rw-r--r-- | spec/controllers/projects/clusters_controller_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb index fa49438287f..35cbab57037 100644 --- a/spec/controllers/projects/clusters_controller_spec.rb +++ b/spec/controllers/projects/clusters_controller_spec.rb @@ -340,7 +340,6 @@ describe Projects::ClustersController do describe 'security' do before do - allow(ClusterConfigureWorker).to receive(:perform_async) stub_kubeclient_get_namespace('https://kubernetes.example.com', namespace: 'my-namespace') end @@ -438,7 +437,6 @@ describe Projects::ClustersController do end before do - allow(ClusterConfigureWorker).to receive(:perform_async) stub_kubeclient_get_namespace('https://kubernetes.example.com', namespace: 'my-namespace') end |