octopress 3.0.0.rc.19 → 3.0.0.rc.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289b5305d8acc880d13c4fa6a1d38a380c832f89
-  data.tar.gz: 8276219b3fce82545abaa5f55f31299c344794e5
+  metadata.gz: 0b6b342aec9d9952a0eea261d006fb8c25731829
+  data.tar.gz: f734839f845e5e53105a0e773a7ed81382a72eca
 SHA512:
-  metadata.gz: d12b6c564acff5052258b854f43e050bd7e21645f60591396adc9299ca2754cdcdb5e75c7d328bc68da92d27092ec443075d2a3164438d5e1c5a88bccab9009e
-  data.tar.gz: 4e4474c9b455b185140eec13076c2149c45130e27e5760f48c64c4d22795b7727a58238d69d7167c83ce065919816b3e2755830637b87c86efa5b8f3799e3cdf
+  metadata.gz: 4cdf194fad9835c4ae9aa6d2db8b6aaf7fb5199eb03d5b5a9928881d6f2aae374f20b223ff06553c62c92763c843cbc9b32b7d1858895f6ec8afce7e68cb6bf5
+  data.tar.gz: 561e88223e1fec6e6e5d91ca691c2a3f0f94d4a6628c7a169fde05e1925d7dbd552fec30028caebd64226abd07faedd499835b02b2af87f9c462ab68dab1201d

data/.travis.yml

@@ -3,3 +3,6 @@ rvm:
   - 2.0.0
   - 1.9.3
 script: bundle exec clash test
+notifications:
+  slack:
+    secure: dncCjIXWEWS8q79MK6OgR9puH3I3W/DrToPo047+rTw4txCr2WZ9o8bcwTCdvuqHQmTB+ofz38ZZQvfF+q0SrG4AP3HPLXc6zv3QOv4Koy7JXDFWg9UMBUvvDSXneOmAJj/wdHAnvrx6LFAFUqutSgJUh6sqOS/yoUlQs5LDPxY=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Octopress Changelog
 
+### 3.0.0 RC20 - 2014-12-11
+
+- Minor improvements to config management system
+
 ### 3.0.0 RC19 - 2014-12-09
 
 - Improvements to configuration management.

data/lib/octopress.rb

@@ -33,7 +33,7 @@ module Octopress
     if @site
       @site.config
     else
-      @config ||= Jekyll.configuration({'config' => options['config']})
+      @config ||= Jekyll.configuration(options)
     end
   end
 
@@ -65,8 +65,7 @@ end
 require 'octopress-docs'
 
 Octopress::Docs.add({
-  name:        "Octopress CLI",
-  slug:        "octopress",
+  name:        "Octopress",
   base_url:    "/octopress",
   dir:         File.expand_path(File.join(File.dirname(__FILE__), "../")),
 })

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.19"
+  VERSION = "3.0.0.rc.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.19
+  version: 3.0.0.rc.20
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary