diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-19 08:17:54 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-19 08:17:54 +0000 |
| commit | 888ed3096946f3b7b93d621285ae4c2c6aeef9d0 (patch) | |
| tree | ee0a28629324a97638165af5fb50d68e4f9d0ccb /app/controllers/projects/clusters_controller.rb | |
| parent | 5ebaafc3bcb79b29cde81809f741a6382891091e (diff) | |
| parent | ecba48bdb04ca59b2fec91ac2a2390523ee5e9e0 (diff) | |
| download | gitlab-ce-888ed3096946f3b7b93d621285ae4c2c6aeef9d0.tar.gz | |
Merge branch 'fix-cluster-enviroment-missing' into 'master'
Fix cluster enviroment missing
See merge request gitlab-org/gitlab-ce!15973
Diffstat (limited to 'app/controllers/projects/clusters_controller.rb')
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 4a7879db313..1dc7f1b3a7f 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -87,6 +87,7 @@ class Projects::ClustersController < Projects::ApplicationController if cluster.managed? params.require(:cluster).permit( :enabled, + :environment_scope, platform_kubernetes_attributes: [ :namespace ] @@ -95,6 +96,7 @@ class Projects::ClustersController < Projects::ApplicationController params.require(:cluster).permit( :enabled, :name, + :environment_scope, platform_kubernetes_attributes: [ :api_url, :token, |