diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 18:30:34 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 18:30:34 +0100 |
| commit | 305bce8d246d2c6e88b5f22439c0ce0833eba1a3 (patch) | |
| tree | e043cb4041c121957610f81d6a65790e91f84fb9 /app/controllers/projects/clusters | |
| parent | 614c0e0bf9c404ba43f835166183a2f1883071d1 (diff) | |
| parent | b8d79cc479200ff714f89dc43a3bbec18af3c5b5 (diff) | |
| download | gitlab-ce-305bce8d246d2c6e88b5f22439c0ce0833eba1a3.tar.gz | |
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
Diffstat (limited to 'app/controllers/projects/clusters')
| -rw-r--r-- | app/controllers/projects/clusters/gcp_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/clusters/user_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index c965a055fdd..66a851c52c7 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -65,6 +65,7 @@ class Projects::Clusters::GcpController < Projects::ApplicationController params.require(:cluster).permit( :enabled, :name, + :environment_scope, provider_gcp_attributes: [ :gcp_project_id, :zone, diff --git a/app/controllers/projects/clusters/user_controller.rb b/app/controllers/projects/clusters/user_controller.rb index d7678512073..d0db64b2fa9 100644 --- a/app/controllers/projects/clusters/user_controller.rb +++ b/app/controllers/projects/clusters/user_controller.rb @@ -26,6 +26,7 @@ class Projects::Clusters::UserController < Projects::ApplicationController params.require(:cluster).permit( :enabled, :name, + :environment_scope, platform_kubernetes_attributes: [ :namespace, :api_url, |