Pass through :is_bare option from wiki_options, allows Gollum to work with gitolite
This commit is contained in:
@@ -9,10 +9,10 @@ module Gollum
|
|||||||
# page_file_dir - String the directory in which all page files reside
|
# page_file_dir - String the directory in which all page files reside
|
||||||
#
|
#
|
||||||
# Returns this instance.
|
# Returns this instance.
|
||||||
def initialize(path, page_file_dir = nil)
|
def initialize(path, page_file_dir = nil, bare = false)
|
||||||
@page_file_dir = page_file_dir
|
@page_file_dir = page_file_dir
|
||||||
@path = path
|
@path = path
|
||||||
@repo = Grit::Repo.new(path)
|
@repo = Grit::Repo.new(path, { :is_bare => bare })
|
||||||
clear
|
clear
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -151,8 +151,9 @@ module Gollum
|
|||||||
path = path.path
|
path = path.path
|
||||||
end
|
end
|
||||||
@path = path
|
@path = path
|
||||||
|
@repo_is_bare = options[:repo_is_bare]
|
||||||
@page_file_dir = options[:page_file_dir]
|
@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] || "/"
|
@base_path = options[:base_path] || "/"
|
||||||
@page_class = options[:page_class] || self.class.page_class
|
@page_class = options[:page_class] || self.class.page_class
|
||||||
@file_class = options[:file_class] || self.class.file_class
|
@file_class = options[:file_class] || self.class.file_class
|
||||||
|
|||||||
Reference in New Issue
Block a user