diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-12-18 21:57:47 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-12-18 22:03:52 +0900 |
| commit | 10ba9cf81e4742e6456fd2f1a3bb947fec5dba71 (patch) | |
| tree | ddfa5a4d451f321fb339b6c80d227c57a34add4b | |
| parent | 8b33670e3144164637b22919ea58a69cea5dc38a (diff) | |
| download | gitlab-ce-ee-fix-cluster-enviroment-missing-backport.tar.gz | |
Drop EE specific changesee-fix-cluster-enviroment-missing-backport
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 13 | ||||
| -rw-r--r-- | spec/factories/clusters/clusters.rb | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 4a7879db313..9611c9cf47d 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -70,19 +70,6 @@ class Projects::ClustersController < Projects::ApplicationController .present(current_user: current_user) end - def create_params - params.require(:cluster).permit( - :enabled, - :name, - :provider_type, - provider_gcp_attributes: [ - :gcp_project_id, - :zone, - :num_nodes, - :machine_type - ]) - end - def update_params if cluster.managed? params.require(:cluster).permit( diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb index 9e73a19e856..cb345230400 100644 --- a/spec/factories/clusters/clusters.rb +++ b/spec/factories/clusters/clusters.rb @@ -4,7 +4,7 @@ FactoryGirl.define do name 'test-cluster' trait :project do - after(:create) do |cluster, evaluator| + before(:create) do |cluster, evaluator| cluster.projects << create(:project) end end |