From 480c8b5062723d2dcf88b0bdf90eb6f9f5f50a32 Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut@me.com>
Date: Tue, 19 Nov 2013 19:11:37 +0100
Subject: [PATCH] Update gem dependencies

---
 Gemfile.lock | 49 ++++++++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 47334cb4..ffd7d976 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.0)
+    activesupport (4.0.1)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -13,38 +13,32 @@ GEM
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     browser (0.2.1)
-    coderay (1.0.9)
+    coderay (1.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
     daemons (1.1.9)
     erubis (2.7.0)
-    escape_utils (0.3.2)
     ethon (0.6.1)
       ffi (>= 1.3.0)
       mime-types (~> 1.18)
     eventmachine (1.0.3)
     execjs (2.0.2)
     fattr (2.2.1)
-    ffi (1.9.0)
-    gemoji (1.4.0)
-    github-markdown (0.5.5)
-    highline (1.6.19)
+    ffi (1.9.3)
+    highline (1.6.20)
     hike (1.2.3)
-    html-pipeline (0.2.1)
-      escape_utils (~> 0.3)
-      gemoji (~> 1.0)
-      github-markdown (~> 0.5)
+    html-pipeline (1.0.0)
+      activesupport (>= 2)
       nokogiri (~> 1.4)
-      rinku (~> 1.7)
-      sanitize (~> 2.0)
     i18n (0.6.5)
+    json (1.8.1)
     method_source (0.8.2)
     mime-types (1.25)
-    mini_portile (0.5.1)
+    mini_portile (0.5.2)
     minitest (4.7.5)
-    multi_json (1.8.1)
+    multi_json (1.8.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     options (2.3.0)
@@ -52,21 +46,18 @@ GEM
     progress_bar (1.0.0)
       highline (~> 1.6.1)
       options (~> 2.3.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    pry (0.9.12.3)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rinku (1.7.3)
     rr (1.1.2)
-    sanitize (2.0.6)
-      nokogiri (>= 1.4.4)
     sass (3.2.12)
-    sinatra (1.4.3)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -77,28 +68,28 @@ GEM
       rack-test
       sinatra (~> 1.4.0)
       tilt (~> 1.3)
-    slop (3.4.6)
+    slop (3.4.7)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.0.1)
+    sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    thin (1.6.0)
+    thin (1.6.1)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
-      rack (>= 1.5.0)
+      rack (>= 1.0.0)
     thor (0.18.1)
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    typhoeus (0.6.5)
+    typhoeus (0.6.6)
       ethon (~> 0.6.1)
     tzinfo (0.3.38)
-    uglifier (2.2.1)
+    uglifier (2.3.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     unix_utils (0.0.15)
     yajl-ruby (1.1.0)