From 047d0f4903e5284b746b5bdf8f478c7b74163f45 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Tue, 20 May 2014 18:36:08 +0200
Subject: [PATCH] gem updates

---
 Gemfile      |  2 +-
 Gemfile.lock | 59 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9ad71f12..8a656727 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,6 @@
 source "https://rubygems.org"
 
 # gem "rails"
-gem 'jekyll', '>=1.4.0'
+gem 'jekyll', '>=2.0.0'
 gem 'mini_magick', '>=3.6.0'
 gem 'fileutils', '>=0.7'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 1a0c5a6b..469ef3cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,50 +2,67 @@ GEM
   remote: https://rubygems.org/
   specs:
     blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
     colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     fileutils (0.7)
       rmagick (>= 2.13.1)
-    highline (1.6.21)
-    jekyll (1.5.1)
+    jekyll (2.1.0)
       classifier (~> 1.3)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.5)
-      listen (~> 1.3)
-      maruku (= 0.7.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.0)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    liquid (2.5.5)
-    listen (1.3.1)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-paginate (1.0.0)
+    jekyll-sass-converter (1.0.0)
+      sass (~> 3.2)
+    jekyll-watch (1.0.0)
+      listen (~> 2.7)
+    kramdown (1.4.0)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    maruku (0.7.0)
+    mercenary (0.3.3)
     mini_magick (3.7.0)
       subexec (~> 0.2.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)
-    pygments.rb (0.5.4)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
+    redcarpet (3.1.2)
     rmagick (2.13.2)
-    safe_yaml (1.0.2)
+    safe_yaml (1.0.3)
+    sass (3.3.9)
     subexec (0.2.3)
+    timers (1.1.0)
     toml (0.1.1)
       parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
@@ -55,5 +72,5 @@ PLATFORMS
 
 DEPENDENCIES
   fileutils (>= 0.7)
-  jekyll (>= 1.4.0)
+  jekyll (>= 2.0.0)
   mini_magick (>= 3.6.0)