Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-13 06:10:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-13 06:10:13 +0300
commitcbc45b28c02f7e610dfa478e3a2b4d4bf6f4c7a4 (patch)
treedc417daf072a896efb5def2f1ba1fff7a348b673 /app/helpers/user_callouts_helper.rb
parent3827baae078970c1027461f01df090b885370c55 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/user_callouts_helper.rb')
-rw-r--r--app/helpers/user_callouts_helper.rb3
1 files changed, 2 insertions, 1 deletions
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