octopress 3.0.0.rc.9 → 3.0.0.rc.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928d005e00226bf64fe9a765855b056d71456cdd
-  data.tar.gz: 0499f3d1ea7a11c5334b28790bb0337139b7993b
+  metadata.gz: 0325806e004cef3b206f8cb47b889917b433c317
+  data.tar.gz: 48e047752fde08f395320585e883cff474c66d74
 SHA512:
-  metadata.gz: 2d0d87b7fe8e0f13f912af8008bfb9bcf10c1851124b232005fcdfed60307743b73e56bea2bcf81211e0ace65239b77b598d4827e2aded3ce5aebf1b13850734
-  data.tar.gz: de68579bad1e44529221764ff6721b7d6c87b9c20567ee4a96a427df2c04e36e131ec3495b926457e5fb9d9c2e96aae1b19631b3ac3123368a8b7cd5c9e0c617
+  metadata.gz: e10d7cdd4c2ac285b224be35b81294c9e78e8a37d696a3de83b5a62eb222bfd930ff2fb19f24c69f0dff9b1448fb073b8d54411e1aaae2f19626de0dc2f785c2
+  data.tar.gz: 07c8b7c503637fad940ca72c9ccd476f591c40e7887cbfb3b4251de463929bb1e2c6084bf92d21e01dce360292f0d7b214552c27b4e5ef14077126ac789b911b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Current released version
 
+### 3.0.0 RC10 - 2014-05-07
+
+- Now using SafeYAML.load instead of YAML.safe_load
+
 ### 3.0.0 RC9 - 2014-05-07
 
 - Support for Jekyll 2.0

data/README.md

@@ -10,7 +10,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
 
 Add this line to your application's Gemfile:
 
-    gem 'octopress', '~> 3.0.0.rc.9'
+    gem 'octopress', '~> 3.0.0.rc.10'
 
 And then execute:
 

data/assets/docs/changelog.markdown

@@ -5,6 +5,10 @@ permalink: /changelog/
 
 ## Current released version
 
+### 3.0.0 RC10 - 2014-05-07
+
+- Now using SafeYAML.load instead of YAML.safe_load
+
 ### 3.0.0 RC9 - 2014-05-07
 
 - Support for Jekyll 2.0

data/assets/docs/index.markdown

@@ -12,7 +12,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
 
 Add this line to your application's Gemfile:
 
-    gem 'octopress', '~> 3.0.0.rc.9'
+    gem 'octopress', '~> 3.0.0.rc.10'
 
 And then execute:
 

data/lib/octopress/configuration.rb

@@ -16,7 +16,7 @@ module Octopress
       user_config = {}
 
       if File.exist? file
-        user_config = YAML.safe_load(File.open(file).read) || {}
+        user_config = SafeYAML.load(File.open(file).read) || {}
       end
 
       user_config = user_config.deep_merge(options['override'] || {})
@@ -32,7 +32,7 @@ module Octopress
 
       (options['config'] || ['_config.yml']).each do |file|
         if File.exist? file
-          configs = configs.deep_merge YAML.safe_load(File.open(file)) 
+          configs = configs.deep_merge SafeYAML.load(File.open(file)) 
         end
       end
 

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.9"
+  VERSION = "3.0.0.rc.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.9
+  version: 3.0.0.rc.10
 platform: ruby
 authors:
 - Brandon Mathis