diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-05 09:08:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-05 09:08:00 +0000 |
| commit | 17ef30f3df6d3939e41e69efc7cfa3deaa08605d (patch) | |
| tree | 6852730e03de7e85e7a42952ec85960ab9832fa5 /app/helpers | |
| parent | cd9bbd8a3e8af73864ca3c7704211309fae8ce0e (diff) | |
| download | gitlab-ce-17ef30f3df6d3939e41e69efc7cfa3deaa08605d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/clusters_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index dbdfa0c1eab..aa0e8c55470 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -462,7 +462,7 @@ module ApplicationSettingsHelper def instance_clusters_enabled? clusterable = Clusters::Instance.new - Feature.enabled?(:certificate_based_clusters, default_enabled: :yaml, type: :ops) && + clusterable.certificate_based_clusters_enabled? && can?(current_user, :read_cluster, clusterable) end diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 116ff284c16..6a721f600f5 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -23,7 +23,7 @@ module ClustersHelper can_add_cluster: clusterable.can_add_cluster?.to_s, can_admin_cluster: clusterable.can_admin_cluster?.to_s, display_cluster_agents: display_cluster_agents?(clusterable).to_s, - certificate_based_clusters_enabled: Feature.enabled?(:certificate_based_clusters, clusterable.clusterable_namespace, default_enabled: :yaml, type: :ops).to_s, + certificate_based_clusters_enabled: clusterable.certificate_based_clusters_enabled?.to_s, default_branch_name: default_branch_name(clusterable), project_path: clusterable_project_path(clusterable), kas_address: Gitlab::Kas.external_url, |