diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 00:06:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 00:06:29 +0000 |
| commit | 98dbb0a488d7b0093f352938210d9578b0f7a8a6 (patch) | |
| tree | 25654204f8de2672556a696199fa209b8f8ff1b3 /app/controllers/clusters/clusters_controller.rb | |
| parent | 9ce26d3dfdf4194f32c470cd3102b4376a53ef2f (diff) | |
| download | gitlab-ce-98dbb0a488d7b0093f352938210d9578b0f7a8a6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/clusters/clusters_controller.rb')
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index 15f1e8284ff..993aba661f3 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -170,6 +170,7 @@ class Clusters::ClustersController < Clusters::BaseController :zone, :num_nodes, :machine_type, + :cloud_run, :legacy_abac ]).merge( provider_type: :gcp, |