From 497af28f839360b12000ffaa7af59e983200e136 Mon Sep 17 00:00:00 2001
From: Dan Barber <hello@danbarber.me>
Date: Tue, 6 Jan 2015 22:24:15 +0000
Subject: [PATCH] Update gems.

---
 Gemfile      |  4 +--
 Gemfile.lock | 70 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3f3b215..4222754 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,8 +8,8 @@ gem 'jekyll'
 gem 'jekyll-assets'
 gem 'jekyll-video-tag'
 
-gem 'octopress', '~> 3.0.0.rc.14'
-gem 'octopress-deploy', '~> 1.0.0.rc.11'
+gem 'octopress', '~> 3.0.0.rc'
+gem 'octopress-deploy', '~> 1.0'
 
 gem 'kramdown', '~> 1.3.3'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5785250..cb74b83 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,26 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.6)
     blankslate (2.1.2.4)
-    bourbon (4.0.2)
+    bourbon (4.1.0)
       sass (~> 3.3)
       thor
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    classifier-reborn (2.0.1)
+    classifier-reborn (2.0.3)
       fast-stemmer (~> 1.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
     colorator (0.1)
-    execjs (2.2.1)
-    facets (2.9.3)
+    execjs (2.2.2)
+    facets (3.0.0)
     fast-stemmer (1.0.2)
-    ffi (1.9.3)
+    fastimage (1.6.6)
+      addressable (~> 2.3, >= 2.3.5)
+    ffi (1.9.6)
     hike (1.2.3)
     hitimes (1.2.2)
-    jekyll (2.4.0)
+    jekyll (2.5.3)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
@@ -35,8 +38,9 @@ GEM
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-assets (0.9.2)
-      jekyll (>= 1.0.0, < 3.0.0)
+    jekyll-assets (0.12.1)
+      fastimage (~> 1.6)
+      jekyll (~> 2.0)
       sass (~> 3.2)
       sprockets (~> 2.10)
       sprockets-helpers
@@ -44,63 +48,67 @@ GEM
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
     jekyll-gist (1.1.0)
-    jekyll-paginate (1.0.0)
-    jekyll-sass-converter (1.2.1)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-video-tag (0.0.2)
-    jekyll-watch (1.1.1)
+    jekyll-video-tag (0.1.0)
+    jekyll-watch (1.2.0)
       listen (~> 2.7)
     json (1.8.1)
     kramdown (1.3.3)
     liquid (2.6.1)
-    listen (2.7.9)
+    listen (2.8.4)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mercenary (0.3.4)
-    mini_magick (3.8.1)
-      subexec (~> 0.2.1)
+    mercenary (0.3.5)
+    mini_magick (4.0.1)
     multi_json (1.10.1)
-    octopress (3.0.0.rc.14)
+    octopress (3.0.0.rc.25)
       jekyll (~> 2.0)
       mercenary (~> 0.3.2)
+      octopress-deploy
+      octopress-escape-code (~> 2.0)
+      octopress-hooks (~> 2.0)
       titlecase
-    octopress-deploy (1.0.0.rc.11)
+    octopress-deploy (1.0.3)
       colorator
-      octopress (~> 3.0.0.rc.10)
+    octopress-escape-code (2.0.6)
+      octopress-hooks (~> 2.0)
+    octopress-hooks (2.3.1)
+      jekyll (~> 2.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.9)
     pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.5.2)
-    rake (10.3.2)
+    rack (1.6.0)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.1.2)
-    safe_yaml (1.0.3)
-    sass (3.4.3)
-    sprockets (2.12.2)
+    redcarpet (3.2.2)
+    safe_yaml (1.0.4)
+    sass (3.4.9)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.2.0)
+    sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    subexec (0.2.3)
     thor (0.19.1)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
     titlecase (0.1.1)
-    toml (0.1.1)
+    toml (0.1.2)
       parslet (~> 1.5.0)
-    uglifier (2.5.3)
+    uglifier (2.6.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     yajl-ruby (1.1.0)
@@ -116,8 +124,8 @@ DEPENDENCIES
   jekyll-video-tag
   kramdown (~> 1.3.3)
   mini_magick
-  octopress (~> 3.0.0.rc.14)
-  octopress-deploy (~> 1.0.0.rc.11)
+  octopress (~> 3.0.0.rc)
+  octopress-deploy (~> 1.0)
   rake
   sass
   uglifier