From 294acf1c5cd2aea353081059c60b3951a2cf7c77 Mon Sep 17 00:00:00 2001
From: Alex Braha Stoll <alexbrahastoll@gmail.com>
Date: Sat, 17 Dec 2016 18:00:29 -0200
Subject: [PATCH] Remove root directory name from index of wikis
---
app/views/projects/wikis/_wiki_pages.html.haml | 6 ++++++
app/views/projects/wikis/pages.html.haml | 17 ++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
create mode 100644 app/views/projects/wikis/_wiki_pages.html.haml
diff --git a/app/views/projects/wikis/_wiki_pages.html.haml b/app/views/projects/wikis/_wiki_pages.html.haml
new file mode 100644
index 00000000000..ac98599d96b
--- /dev/null
+++ b/app/views/projects/wikis/_wiki_pages.html.haml
@@ -0,0 +1,6 @@
+- wiki_pages.each do |wiki_page|
+ %li
+ = link_to wiki_page.title, namespace_project_wiki_path(@project.namespace, @project, wiki_page)
+ %small (#{wiki_page.format})
+ .pull-right
+ %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index 274afb1bdea..2813b3a1c81 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -15,13 +15,12 @@
%ul.content-list
- @wiki_directories.each do |wiki_directory, wiki_pages|
- %li
- = wiki_directory
- %ul
- - wiki_pages.each do |wiki_page|
- %li
- = link_to wiki_page.title, namespace_project_wiki_path(@project.namespace, @project, wiki_page)
- %small (#{wiki_page.format})
- .pull-right
- %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
+ - if wiki_directory == '/'
+ = render 'wiki_pages', wiki_pages: wiki_pages
+ - else
+ %li
+ = wiki_directory
+ %ul
+ = render 'wiki_pages', wiki_pages: wiki_pages
+
= paginate @wiki_pages, theme: 'gitlab'
--
GitLab