summaryrefslogtreecommitdiff
path: root/app/presenters
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-10 12:09:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-10 12:09:36 +0000
commitc6a33b298229f9e04933be43d6176c476ef03012 (patch)
tree66b336ef374b813d6e9c7f6a19264060a1f23f91 /app/presenters
parentc52b81f45762cb7f05a950689dfc6d51b197ea73 (diff)
downloadgitlab-ce-c6a33b298229f9e04933be43d6176c476ef03012.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/clusters/cluster_presenter.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/presenters/clusters/cluster_presenter.rb b/app/presenters/clusters/cluster_presenter.rb
index 3ace27c72d5..c4e3393cac9 100644
--- a/app/presenters/clusters/cluster_presenter.rb
+++ b/app/presenters/clusters/cluster_presenter.rb
@@ -89,3 +89,5 @@ module Clusters
end
end
end
+
+Clusters::ClusterPresenter.prepend_if_ee('EE::Clusters::ClusterPresenter')