diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2019-04-01 17:36:11 +0300 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-04-01 17:36:11 +0300 |
| commit | 04bb35a4b562fd57b14c55645bb1848a50cdef56 (patch) | |
| tree | 1bd1ac2af6a5c088ac2529cdbccceeca402d3ebe /app/controllers/clusters/clusters_controller.rb | |
| parent | ade207e575ab846f6d354aaccc1382a6e512dd0d (diff) | |
| parent | b8118a65d595040bfce2d83d5e38dd63ebfedb58 (diff) | |
| download | gitlab-ce-id-split-self-approval-restrictions.tar.gz | |
Merge branch 'master' into id-split-self-approval-restrictionsid-split-self-approval-restrictions
Diffstat (limited to 'app/controllers/clusters/clusters_controller.rb')
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index 68a2a83f0de..e82756e4643 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -123,25 +123,25 @@ class Clusters::ClustersController < Clusters::BaseController private def update_params - if cluster.managed? + if cluster.provided_by_user? params.require(:cluster).permit( :enabled, + :name, :environment_scope, :base_domain, platform_kubernetes_attributes: [ + :api_url, + :token, + :ca_cert, :namespace ] ) else params.require(:cluster).permit( :enabled, - :name, :environment_scope, :base_domain, platform_kubernetes_attributes: [ - :api_url, - :token, - :ca_cert, :namespace ] ) |