diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-12-21 17:20:43 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-12-21 17:20:43 -0600 |
| commit | aa1874fbf8795677e53797205cb65b6f4fb83d4c (patch) | |
| tree | 85a5cfb6bdac803258df8e2df09a50169468996a /app/controllers/projects/clusters_controller.rb | |
| parent | 3895d54c6bfbd37ac65624496c0fd7b4973944e7 (diff) | |
| parent | 82e31ee46784cc4a0b987511ce7506dd01a3f004 (diff) | |
| download | gitlab-ce-move-gl-dropdown.tar.gz | |
Merge branch 'master' into move-gl-dropdownmove-gl-dropdown
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, |