summaryrefslogtreecommitdiff
path: root/app/views/projects/settings
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-04 15:54:16 +0100
committerPhil Hughes <me@iamphill.com>2017-05-04 15:54:16 +0100
commit79f40f27fd64b9209e1faa528e658d831e2c7f2f (patch)
tree5eb1c7837b5180c0071ec75e238c27fe917023ee /app/views/projects/settings
parent5c91113c5b6edc4fa1d63bc161b791c7e84e644d (diff)
parent985737fdcf9b79dadfb72d0c9ed9abf4464559f8 (diff)
downloadgitlab-ce-79f40f27fd64b9209e1faa528e658d831e2c7f2f.tar.gz
Merge branch 'master' into deploy-keys-load-async
Diffstat (limited to 'app/views/projects/settings')
-rw-r--r--app/views/projects/settings/_head.html.haml9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/settings/_head.html.haml b/app/views/projects/settings/_head.html.haml
index 5a5ade03624..8c7f9e0191e 100644
--- a/app/views/projects/settings/_head.html.haml
+++ b/app/views/projects/settings/_head.html.haml
@@ -27,7 +27,8 @@
= link_to namespace_project_settings_ci_cd_path(@project.namespace, @project), title: 'CI/CD Pipelines' do
%span
CI/CD Pipelines
- = nav_link(controller: :pages) do
- = link_to namespace_project_pages_path(@project.namespace, @project), title: 'Pages' do
- %span
- Pages
+ - if Gitlab.config.pages.enabled
+ = nav_link(controller: :pages) do
+ = link_to namespace_project_pages_path(@project.namespace, @project), title: 'Pages' do
+ %span
+ Pages