summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-12-10 08:37:37 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-12-10 08:37:37 +0000
commitf124328b2919fb1ed6b1fa65a9ce8855ec2e0420 (patch)
tree88a695422c23df50f1b469f7c37fc686f3c2ad63
parent7cb0dd98590e8fdd7483b9f61643a0daa23c2b67 (diff)
parent19dc87a2eb73b03fb0905345fe8367122e4d459e (diff)
downloadgitlab-ce-f124328b2919fb1ed6b1fa65a9ce8855ec2e0420.tar.gz
Merge branch '8400-operations-check-ce' into 'master'
Backport operations_path helper See merge request gitlab-org/gitlab-ce!23654
-rw-r--r--app/helpers/projects_helper.rb4
-rw-r--r--app/views/layouts/nav/sidebar/_project.html.haml4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 35e66f59dfe..87aebe415c8 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -391,6 +391,10 @@ module ProjectsHelper
end
end
+ def sidebar_operations_link_path(project = @project)
+ metrics_project_environments_path(project) if can?(current_user, :read_environment, project)
+ end
+
def project_last_activity(project)
if project.last_activity_at
time_ago_with_tooltip(project.last_activity_at, placement: 'bottom', html_class: 'last_activity_time_ago')
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index b89541a3c9f..bdd0108db0d 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -196,7 +196,7 @@
- if project_nav_tab? :operations
= nav_link(controller: sidebar_operations_paths) do
- = link_to metrics_project_environments_path(@project), class: 'shortcuts-operations' do
+ = link_to sidebar_operations_link_path, class: 'shortcuts-operations' do
.nav-icon-container
= sprite_icon('cloud-gear')
%span.nav-item-name
@@ -204,7 +204,7 @@
%ul.sidebar-sub-level-items
= nav_link(controller: sidebar_operations_paths, html_options: { class: "fly-out-top-item" } ) do
- = link_to metrics_project_environments_path(@project) do
+ = link_to sidebar_operations_link_path do
%strong.fly-out-top-item-name
= _('Operations')
%li.divider.fly-out-top-item