Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 31dfcbaa9e | |||
| 8e11c5f46d |
+1
-1
@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
|
|||||||
s.required_ruby_version = ">= 1.8.7"
|
s.required_ruby_version = ">= 1.8.7"
|
||||||
|
|
||||||
s.name = 'gollum'
|
s.name = 'gollum'
|
||||||
s.version = '2.4.8'
|
s.version = '2.4.9'
|
||||||
s.date = '2012-12-20'
|
s.date = '2012-12-20'
|
||||||
s.rubyforge_project = 'gollum'
|
s.rubyforge_project = 'gollum'
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)
|
|||||||
$KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
|
$KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
|
||||||
|
|
||||||
module Gollum
|
module Gollum
|
||||||
VERSION = '2.4.8'
|
VERSION = '2.4.9'
|
||||||
|
|
||||||
def self.assets_path
|
def self.assets_path
|
||||||
::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
|
::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
|
||||||
|
|||||||
@@ -180,11 +180,13 @@ module Precious
|
|||||||
@name = wikip.name.to_url
|
@name = wikip.name.to_url
|
||||||
@path = wikip.path
|
@path = wikip.path
|
||||||
|
|
||||||
# --page-file-dir docs
|
|
||||||
# /docs/Home should be created in /Home
|
|
||||||
# not /docs/Home because write_page will append /docs
|
|
||||||
page_dir = settings.wiki_options[:page_file_dir].to_s
|
page_dir = settings.wiki_options[:page_file_dir].to_s
|
||||||
@path = @path.sub(page_dir, '/') if @path.start_with? page_dir
|
unless page_dir.empty?
|
||||||
|
# --page-file-dir docs
|
||||||
|
# /docs/Home should be created in /Home
|
||||||
|
# not /docs/Home because write_page will append /docs
|
||||||
|
@path = @path.sub(page_dir, '/') if @path.start_with? page_dir
|
||||||
|
end
|
||||||
|
|
||||||
page = wikip.page
|
page = wikip.page
|
||||||
if page
|
if page
|
||||||
|
|||||||
Reference in New Issue
Block a user