summaryrefslogtreecommitdiff
path: root/app/controllers/clusters
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-05 21:08:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-05 21:08:47 +0000
commit3ef453aa1cf8cc5f90a728fa3ebc166090ff2e3e (patch)
treecfb343b2edfd02650e912e1b8f438a0e6a00a2d8 /app/controllers/clusters
parentec18750aa8538712b952b8265581fc3b3e037923 (diff)
downloadgitlab-ce-3ef453aa1cf8cc5f90a728fa3ebc166090ff2e3e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/clusters')
-rw-r--r--app/controllers/clusters/base_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/clusters/base_controller.rb b/app/controllers/clusters/base_controller.rb
index 188805c6106..b1ffdf00b87 100644
--- a/app/controllers/clusters/base_controller.rb
+++ b/app/controllers/clusters/base_controller.rb
@@ -8,6 +8,8 @@ class Clusters::BaseController < ApplicationController
helper_method :clusterable
+ feature_category :kubernetes_management
+
private
def cluster