diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-13 17:04:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-13 17:04:15 +0000 |
| commit | 018a7c6a550494a7dd386450b464d5692413f319 (patch) | |
| tree | 65c10ca3f5e627b25fa4a2b10e76a7504628d69c /app/controllers | |
| parent | 79e8e6134f89c4a09a422ca128a7579d844f040c (diff) | |
| parent | fe5a753be903344a6cc1dc8f1e023b62887e920b (diff) | |
| download | gitlab-ce-018a7c6a550494a7dd386450b464d5692413f319.tar.gz | |
Merge branch '23535-folders-in-wiki-repository' into 'master'
Show directory hierarchy when listing wiki pages
Closes #23535
See merge request !8133
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/wikis_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 8e683931b2e..0faa71c4d7d 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -8,6 +8,7 @@ class Projects::WikisController < Projects::ApplicationController def pages @wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page]) + @wiki_entries = WikiPage.group_by_directory(@wiki_pages) end def show @@ -116,7 +117,7 @@ class Projects::WikisController < Projects::ApplicationController # Call #wiki to make sure the Wiki Repo is initialized @project_wiki.wiki - @sidebar_wiki_pages = @project_wiki.pages.first(15) + @sidebar_wiki_entries = WikiPage.group_by_directory(@project_wiki.pages.first(15)) rescue ProjectWiki::CouldNotCreateWikiError flash[:notice] = "Could not create Wiki Repository at this time. Please try again later." redirect_to project_path(@project) |