From 98dbb0a488d7b0093f352938210d9578b0f7a8a6 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 23 Sep 2019 00:06:29 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/controllers/clusters/clusters_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers/clusters/clusters_controller.rb')

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,
-- 
cgit v1.2.1