diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-13 03:10:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-13 03:10:13 +0000 |
| commit | cbc45b28c02f7e610dfa478e3a2b4d4bf6f4c7a4 (patch) | |
| tree | dc417daf072a896efb5def2f1ba1fff7a348b673 /app/helpers | |
| parent | 3827baae078970c1027461f01df090b885370c55 (diff) | |
| download | gitlab-ce-cbc45b28c02f7e610dfa478e3a2b4d4bf6f4c7a4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 1 | ||||
| -rw-r--r-- | app/helpers/user_callouts_helper.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 3eae744e6ec..cab7ee6bc6b 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -748,6 +748,7 @@ module ProjectsHelper gcp logs product_analytics + metrics_dashboard ] end diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb index 34c8ce51df0..f1ecba6e68a 100644 --- a/app/helpers/user_callouts_helper.rb +++ b/app/helpers/user_callouts_helper.rb @@ -13,7 +13,8 @@ module UserCalloutsHelper end def show_gke_cluster_integration_callout?(project) - can?(current_user, :create_cluster, project) && + active_nav_link?(controller: sidebar_operations_paths) && + can?(current_user, :create_cluster, project) && !user_dismissed?(GKE_CLUSTER_INTEGRATION) end |