diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 03:06:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 03:06:07 +0000 |
| commit | 7f3bff1556594dcdc1beca40d083ba7263965e21 (patch) | |
| tree | ab18d957d9bc7b2888c6e9fa9b281a7c1cb8927b /app/controllers/clusters | |
| parent | 8d0aed5e4a6ae59232cfa5ca168fa1b87073520d (diff) | |
| download | gitlab-ce-7f3bff1556594dcdc1beca40d083ba7263965e21.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/clusters')
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index 9a539cf7c24..673ead04709 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -172,11 +172,7 @@ class Clusters::ClustersController < Clusters::BaseController private def destroy_params - # To be uncomented on https://gitlab.com/gitlab-org/gitlab/merge_requests/16954 - # This MR got split into other since it was too big. - # - # params.permit(:cleanup) - {} + params.permit(:cleanup) end def update_params |