Merge remote-tracking branch 'upstream/master' into toc

Conflicts: lib/gollum/frontend/app.rb lib/gollum/markup.rb test/test_markup.rb
2012-05-14 09:12:44 -07:00
parent 6191f60025 20389babbc
commit d7f4eeea2c
92 changed files with 8356 additions and 24 deletions
@@ -158,8 +158,9 @@ module Gollum
        path             = path.path
      end
      @path          = path
+      @repo_is_bare  = options[:repo_is_bare]
      @page_file_dir = options[:page_file_dir]
-      @access        = options[:access]       || GitAccess.new(path, @page_file_dir)
+      @access        = options[:access]       || GitAccess.new(path, @page_file_dir, @repo_is_bare)
      @base_path     = options[:base_path]    || "/"
      @page_class    = options[:page_class]   || self.class.page_class
      @file_class    = options[:file_class]   || self.class.file_class