lib/gollum/frontend/app.rb in gollum-2.3.1 vs lib/gollum/frontend/app.rb in gollum-2.3.2

- old
+ new

@@ -321,16 +321,20 @@ }x do |path| @path = extract_path(path) if path wiki_options = settings.wiki_options.merge({ :page_file_dir => @path }) wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options) @results = wiki.pages + @results += wiki.files if settings.wiki_options[:show_all] @ref = wiki.ref mustache :pages end get '/fileview' do wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options) - @results = Gollum::FileView.new(wiki.pages).render_files + show_all = settings.wiki_options[:show_all] + # if showing all files include wiki.files + @results = show_all ? Gollum::FileView.new(wiki.pages + wiki.files, show_all).render_files : + Gollum::FileView.new(wiki.pages).render_files @ref = wiki.ref mustache :file_view, { :layout => false } end get '/*' do