dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'christianhellsten/master' into next

This commit is contained in:
Tom Preston-Werner 2010-06-22 16:01:48 -07:00
parent 9bb2066cf1 68c69fb3ef
commit f8484570b7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll.rb
View File

@ -55,7 +55,7 @@ module Jekyll
'server' => false, 'server' => false,
'server_port' => 4000, 'server_port' => 4000,
'source' => '.', 'source' => Dir.pwd,
'destination' => File.join('.', '_site'), 'destination' => File.join('.', '_site'),
'plugins' => File.join('.', '_plugins'), 'plugins' => File.join('.', '_plugins'),

2
test/test_configuration.rb
View File

@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/helper'
class TestConfiguration < Test::Unit::TestCase class TestConfiguration < Test::Unit::TestCase
context "loading configuration" do context "loading configuration" do
setup do setup do
@path = './_config.yml' @path = File.join(Dir.pwd, '_config.yml')
end end
should "fire warning with no _config.yml" do should "fire warning with no _config.yml" do