From c52b72f5772d52e9fc85bd9f4e8b8497a6278c37 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Jul 2020 12:09:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/clusters_helper.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'app/helpers/clusters_helper.rb') diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 1204f882707..005070cca5c 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true module ClustersHelper - # EE overrides this def has_multiple_clusters? - false + true end def create_new_cluster_label(provider: nil) @@ -95,5 +94,3 @@ module ClustersHelper can?(user, :admin_cluster, cluster) end end - -ClustersHelper.prepend_if_ee('EE::ClustersHelper') -- cgit v1.2.3