Merge remote branch 'christianhellsten/master' into next

basharabdullah · Jun 22, 2010 · f848457 · f848457
2 parents 9bb2066 + 68c69fb
commit f848457
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
@@ -55,7 +55,7 @@ module Jekyll
     'server'       => false,
     'server_port'  => 4000,
 
-    'source'       => '.',
+    'source'       => Dir.pwd,
     'destination'  => File.join('.', '_site'),
     'plugins'      => File.join('.', '_plugins'),
 

diff --git a/test/test_configuration.rb b/test/test_configuration.rb
@@ -3,7 +3,7 @@
 class TestConfiguration < Test::Unit::TestCase
   context "loading configuration" do
     setup do
-      @path = './_config.yml'
+      @path = File.join(Dir.pwd, '_config.yml')
     end
 
     should "fire warning with no _config.yml" do