diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-13 20:32:06 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-13 20:32:06 +0200 |
| commit | 52983a84b9dbb8beaef3ebaf3d502c6ec34f7362 (patch) | |
| tree | 0c438daac96e2ada52ceb18ee22dc2f945e1fbac | |
| parent | 1a57fbc437487816b0200e4b91df4b1bc2d4c07f (diff) | |
| parent | 7816488a8967d4c87e84a35027499c1a5cb5406e (diff) | |
| download | gitlab-ce-52983a84b9dbb8beaef3ebaf3d502c6ec34f7362.tar.gz | |
Merge branch 'stanhu/gitlab-ce-wiki-add-new-page-in-pages-tab'
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/wikis/pages.html.haml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0ffa7b0642f..c3fd5baa67a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -50,6 +50,7 @@ v 8.1.0 (unreleased) - Invalidate stored service password if the endpoint URL is changed - Project names are not fully shown if group name is too big, even on group page view - Apply new design for Files page + - Add "New Page" button to Wiki Pages tab (Stan Hu) v 8.0.4 - Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu) 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 |