diff options
| author | Alex Braha Stoll <alexbrahastoll@gmail.com> | 2016-12-27 02:05:53 -0200 |
|---|---|---|
| committer | Alex Braha Stoll <alexbrahastoll@gmail.com> | 2016-12-31 16:55:50 -0200 |
| commit | d2b3fe45af8d458b935b3bbfc1558e21c1476d0a (patch) | |
| tree | 22d8ec4b4f4de96ce369aaa124d64d822f313877 /app/models/wiki_page.rb | |
| parent | 104bfa2a3187aefebd4a53be1ad14600dc7781e9 (diff) | |
| download | gitlab-ce-d2b3fe45af8d458b935b3bbfc1558e21c1476d0a.tar.gz | |
Change WikiPage#directory
Diffstat (limited to 'app/models/wiki_page.rb')
| -rw-r--r-- | app/models/wiki_page.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index dec58681198..6c237306eff 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -25,10 +25,10 @@ class WikiPage pages.sort_by { |page| [page.directory, page.slug] }. group_by { |page| page.directory }. map do |dir, pages| - if dir == '/' - pages - else + if dir.present? WikiDirectory.new(dir, pages) + else + pages end end. flatten @@ -98,8 +98,7 @@ class WikiPage # The hierarchy of the directory this page is contained in. def directory - dir = wiki.page_title_and_dir(slug).last - "/#{dir}" + wiki.page_title_and_dir(slug).last end # The processed/formatted content of this page. |