diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-29 14:21:28 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-29 14:21:28 +0000 |
| commit | c1717225c2157d00658333376f1362d4084999cb (patch) | |
| tree | ad65fe748d57a7344b13a9e90816b33529e24556 /app/helpers/projects_helper.rb | |
| parent | 88f28e0ec8259082a16636bbf2247e14eee927a0 (diff) | |
| parent | 4c74936f4567ba142bcd9ca31c8f5f10c8aa52fa (diff) | |
| download | gitlab-ce-bootstrap-fixes-from-ee.tar.gz | |
Merge branch 'master' into 'bootstrap-fixes-from-ee'bootstrap-fixes-from-ee
# Conflicts:
# app/assets/javascripts/jobs/components/sidebar_details_block.vue
Diffstat (limited to 'app/helpers/projects_helper.rb')
| -rw-r--r-- | app/helpers/projects_helper.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index fa54eafd3a3..55078e1a2d2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -257,6 +257,9 @@ module ProjectsHelper if project.builds_enabled? && can?(current_user, :read_pipeline, project) nav_tabs << :pipelines + end + + if can?(current_user, :read_environment, project) || can?(current_user, :read_cluster, project) nav_tabs << :operations end |