diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/helpers/clusters_helper.rb | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/helpers/clusters_helper.rb')
-rw-r--r-- | app/helpers/clusters_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 93b6b4e8fe2..1475a26ca09 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -28,7 +28,8 @@ module ClustersHelper clusters_empty_state_image: image_path('illustrations/empty-state/empty-state-clusters.svg'), empty_state_help_text: clusterable.empty_state_help_text, new_cluster_path: clusterable.new_path(tab: 'create'), - can_add_cluster: clusterable.can_add_cluster?.to_s + can_add_cluster: clusterable.can_add_cluster?.to_s, + can_admin_cluster: clusterable.can_admin_cluster?.to_s } end @@ -38,7 +39,8 @@ module ClustersHelper empty_state_image: image_path('illustrations/empty-state/empty-state-agents.svg'), project_path: clusterable.full_path, add_cluster_path: clusterable.new_path(tab: 'add'), - kas_address: Gitlab::Kas.external_url + kas_address: Gitlab::Kas.external_url, + gitlab_version: Gitlab.version_info }.merge(js_clusters_list_data(clusterable)) end |