Merge pull request #1589 from imathis/jekyll-2

Jekyll 2.0 compatability

1 files changed, 72 insertions, 36 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 182c30bc..55a3c463 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,49 +2,86 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    chunky_png (1.2.5)
-    classifier (1.3.3)
+    blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chunky_png (1.3.1)
+    classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
-    compass (0.12.2)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
+    colorator (0.1)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
-    directory_watcher (1.4.1)
-    fast-stemmer (1.0.1)
-    fssm (0.2.9)
-    haml (3.1.7)
-    jekyll (0.12.0)
+      sass (~> 3.2.19)
+    execjs (2.2.0)
+    fast-stemmer (1.0.2)
+    ffi (1.9.3)
+    fssm (0.2.10)
+    haml (4.0.5)
+      tilt
+    jekyll (2.0.3)
       classifier (~> 1.3)
-      directory_watcher (~> 1.1)
-      kramdown (~> 0.13.4)
-      liquid (~> 2.3)
-      maruku (~> 0.5)
-      pygments.rb (~> 0.3.2)
-    kramdown (0.13.8)
-    liquid (2.3.0)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.3.4)
+      colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      kramdown (~> 1.3)
+      liquid (~> 2.5.5)
+      listen (~> 2.5)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.5.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-date-format (1.0.0)
+      jekyll (>= 1.0.0)
+    jekyll-page-hooks (1.2.0)
+      jekyll (>= 2.0.0)
+    jekyll-sass-converter (1.0.0)
+      sass (~> 3.2)
+    jekyll-sitemap (0.4.1)
+      jekyll (~> 2.0)
+    kramdown (1.4.0)
+    liquid (2.5.5)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    mercenary (0.3.3)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.8)
+    pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
-    rake (0.9.2.2)
-    rb-fsevent (0.9.1)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
     rdiscount (2.0.7.3)
+    redcarpet (3.1.2)
     rubypants (0.2.0)
-    sass (3.2.9)
+    safe_yaml (1.0.3)
+    sass (3.2.19)
     sass-globbing (1.0.0)
       sass (>= 3.1)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
+    sinatra (1.4.5)
+      rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     stringex (1.4.0)
-    syntax (1.0.0)
-    tilt (1.3.7)
+    tilt (1.4.1)
+    timers (1.1.0)
+    toml (0.1.1)
+      parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -53,16 +90,15 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (~> 4.2.9)
   compass (~> 0.12.2)
-  directory_watcher (= 1.4.1)
-  haml (~> 3.1.7)
-  jekyll (~> 0.12)
-  liquid (~> 2.3.0)
-  pygments.rb (~> 0.3.4)
-  rake (~> 0.9)
+  haml (~> 4.0)
+  jekyll (~> 2.0)
+  jekyll-date-format (~> 1.0)
+  jekyll-page-hooks (~> 1.2)
+  jekyll-sitemap
+  rake (~> 10.0)
   rb-fsevent (~> 0.9)
-  rdiscount (~> 2.0.7)
+  rdiscount (~> 2.0)
   rubypants (~> 0.2.0)
-  sass (~> 3.2)
   sass-globbing (~> 1.0.0)
   sinatra (~> 1.4.2)
   stringex (~> 1.4.0)