summaryrefslogtreecommitdiff
path: root/app/views/layouts/nav
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-08 21:06:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-08 21:06:38 +0000
commitae72d71da85732ec9ceb9723953fe6ca1df0fdf6 (patch)
tree9e1096312c5fc03a7657ae9586a6714f04ddf8ad /app/views/layouts/nav
parent759bab058520a21d87087355dc193f634176e98a (diff)
downloadgitlab-ce-ae72d71da85732ec9ceb9723953fe6ca1df0fdf6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/nav')
-rw-r--r--app/views/layouts/nav/sidebar/_project.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index 2c0cb973542..9b3ad05d0c0 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -247,6 +247,8 @@
%span
= _('Serverless')
+ = render_if_exists 'layouts/nav/sidebar/pod_logs_link' # EE-specific
+
- if project_nav_tab? :clusters
- show_cluster_hint = show_gke_cluster_integration_callout?(@project)
= nav_link(controller: [:clusters, :user, :gcp]) do