summaryrefslogtreecommitdiff
path: root/app/views/layouts/nav/_project_settings.html.haml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-09-01 15:28:14 +0000
committerDouwe Maan <douwe@gitlab.com>2016-09-01 15:28:14 +0000
commitd308a3f4335845d88cbb4fbfbea9d72fa2473769 (patch)
treed9b53fc90b0db5416b2eb78b56766aec646a2095 /app/views/layouts/nav/_project_settings.html.haml
parentae439a62cca06fdc719d53dd32e7235cf219c3c7 (diff)
parent892dea67717c0efbd6a28f7639f34535ec0a8747 (diff)
downloadgitlab-ce-d308a3f4335845d88cbb4fbfbea9d72fa2473769.tar.gz
Merge branch 'issue_19734' into 'master'
Project tools visibility level ## part of #19734 ![project_features_access_level](/uploads/81ec7185d4e61d7578652020209af925/project_features_access_level.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5606
Diffstat (limited to 'app/views/layouts/nav/_project_settings.html.haml')
-rw-r--r--app/views/layouts/nav/_project_settings.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index 52a5bdc1a1b..613b8b7d301 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -26,7 +26,7 @@
%span
Protected Branches
- - if @project.builds_enabled?
+ - if @project.feature_available?(:builds, current_user)
= nav_link(controller: :runners) do
= link_to namespace_project_runners_path(@project.namespace, @project), title: 'Runners' do
%span