diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-24 15:06:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-24 15:06:03 +0300 |
| commit | 33813f993b49da58426d33a148ee70952e6835bb (patch) | |
| tree | a8310742d6eb7e1dc83f72ceba1fefb3d5b8a030 /app/controllers/clusters | |
| parent | dc0622dbe3cd552abca4107557c6c09edb23625c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/clusters')
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index bb47ccb72b3..abec237dd1d 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -142,6 +142,7 @@ class Clusters::ClustersController < Clusters::BaseController :environment_scope, :managed, :base_domain, + :management_project_id, platform_kubernetes_attributes: [ :api_url, :token, @@ -155,6 +156,7 @@ class Clusters::ClustersController < Clusters::BaseController :environment_scope, :managed, :base_domain, + :management_project_id, platform_kubernetes_attributes: [ :namespace ] |