Release 1.4.1

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

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}'"

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."

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.

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