summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-13 20:32:06 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-13 20:32:06 +0200
commit52983a84b9dbb8beaef3ebaf3d502c6ec34f7362 (patch)
tree0c438daac96e2ada52ceb18ee22dc2f945e1fbac /app
parent1a57fbc437487816b0200e4b91df4b1bc2d4c07f (diff)
parent7816488a8967d4c87e84a35027499c1a5cb5406e (diff)
downloadgitlab-ce-52983a84b9dbb8beaef3ebaf3d502c6ec34f7362.tar.gz
Merge branch 'stanhu/gitlab-ce-wiki-add-new-page-in-pages-tab'
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/wikis/pages.html.haml1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index 03e6a522b25..d179a1abec1 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -3,6 +3,7 @@
= render 'nav'
.gray-content-block
+ = render 'main_links'
%h3.page-title
All Pages
%ul.content-list