diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:49 +0000 |
commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /lib/api/group_clusters.rb | |
parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) | |
download | gitlab-ce-1308dc5eb484ab0f8064989fc551ebdb4b1a7976.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/group_clusters.rb')
-rw-r--r-- | lib/api/group_clusters.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/group_clusters.rb b/lib/api/group_clusters.rb index abfe10b7fa1..0108f6feae3 100644 --- a/lib/api/group_clusters.rb +++ b/lib/api/group_clusters.rb @@ -59,7 +59,7 @@ module API requires :token, type: String, desc: 'Token to authenticate against Kubernetes' optional :ca_cert, type: String, desc: 'TLS certificate (needed if API is using a self-signed TLS certificate)' optional :namespace, type: String, desc: 'Unique namespace related to Group' - optional :authorization_type, type: String, values: Clusters::Platforms::Kubernetes.authorization_types.keys, default: 'rbac', desc: 'Cluster authorization type, defaults to RBAC' + optional :authorization_type, type: String, values: ::Clusters::Platforms::Kubernetes.authorization_types.keys, default: 'rbac', desc: 'Cluster authorization type, defaults to RBAC' end use :create_params_ee end @@ -96,7 +96,7 @@ module API put ':id/clusters/:cluster_id' do authorize! :update_cluster, cluster - update_service = Clusters::UpdateService.new(current_user, update_cluster_params) + update_service = ::Clusters::UpdateService.new(current_user, update_cluster_params) if update_service.execute(cluster) present cluster, with: Entities::ClusterGroup |