jekyll 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5466e36bab3cde8d7f3be1b61f7f8bf52b458750
-  data.tar.gz: 08fee26752318820f8ccaaa0158fea42a4764a70
+  metadata.gz: 24060aa80c98b5612f5e896317353d8972318ca8
+  data.tar.gz: ad7096265d92cfb3ee9f7620d32133293bc5658b
 SHA512:
-  metadata.gz: fe10f7294a52a2def29b0a618f97805d834ebf779ca51bccc129829e9bd9c98ab53b1a34883c248a92b5ed7b8e9bbaf0fda0c30dd4907ff182c9c208c9ed1d3f
-  data.tar.gz: 4f4e15d14f2af09e0429e707665c85a3b80567a25474a980b80c833b102d7b713fe1c124b630036591507fb70899022474fadf9a27405afd7a2b0138fd197492
+  metadata.gz: c58c1355f8110a62c82b65106695a6f223004837de92e8878f4a6cddca21404c738d9d5681ad63be124d5f17ecf31b098f5edc6f65b68c82607dfe344c586349
+  data.tar.gz: 7b756ecc80484030c97cd27e5552748ef85288ec193e2fd75885945f5aa36f268ca1ba138c50d9369edcc39f684de6cde49f6d82c0c1e6b4d348eef6d7e140d6

data/History.markdown

@@ -10,6 +10,19 @@
 
 ### Site Enhancements
 
+## 1.4.1 / 2013-12-09
+
+### Major Enhancements
+
+### Minor Enhancements
+
+### Bug Fixes
+  * Don't allow nil entries when loading posts (#1796)
+
+### Development Fixes
+
+### Site Enhancements
+
 ## 1.4.0 / 2013-12-07
 
 ### Major Enhancements

data/Rakefile

@@ -252,8 +252,8 @@ end
 #############################################################################
 
 task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
+  unless `git branch` =~ /^(\* master|\* v1-stable)$/
+    puts "You must be on the master branch or the v1-stable branch to release!"
     exit!
   end
   sh "git commit --allow-empty -m 'Release #{version}'"

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.4.0'
+  s.version           = '1.4.1'
   s.license           = 'MIT'
-  s.date              = '2013-12-07'
+  s.date              = '2013-12-09'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."

data/lib/jekyll.rb

@@ -63,7 +63,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.

data/lib/jekyll/site.rb

@@ -193,8 +193,10 @@ module Jekyll
     end
 
     def read_things(dir, magic_dir, klass)
-      things = get_entries(dir, magic_dir).map do |entry|
+      get_entries(dir, magic_dir).map do |entry|
         klass.new(self, self.source, dir, entry) if klass.valid?(entry)
+      end.reject do |entry|
+        entry.nil?
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid