From: Tom Hughes <tom@compton.nu>
Date: Mon, 8 Dec 2014 08:02:00 +0000 (+0000)
Subject: Update bundle
X-Git-Tag: live~4270
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1bfc96ec76615e69668e3ce187b8127b752d0cf8?hp=9934eed1903d347dcbfd1dc2df99063febdb3899

Update bundle
---

diff --git a/Gemfile.lock b/Gemfile.lock
index cdbc9888d..8b0f5cefc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
-    autoprefixer-rails (4.0.0.1)
+    autoprefixer-rails (4.0.1.1)
       execjs
     bigdecimal (1.1.0)
     builder (3.2.2)
@@ -79,7 +79,7 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
-    jwt (1.0.0)
+    jwt (1.2.0)
     kgio (2.9.2)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)
@@ -96,7 +96,7 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     nokogumbo (1.1.12)
       nokogiri
@@ -127,7 +127,7 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    psych (2.0.6)
+    psych (2.0.8)
     r2 (0.2.5)
     rack (1.5.2)
     rack-cors (0.2.9)
@@ -154,8 +154,8 @@ GEM
       activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    redcarpet (3.2.0)
+    rake (10.4.2)
+    redcarpet (3.2.1)
     rinku (1.7.3)
     ruby-openid (2.6.0)
     sanitize (3.0.3)
@@ -163,18 +163,18 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.1.12)
     sass (3.2.19)
-    sass-rails (4.0.4)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
     soap4r-ruby1.9 (2.0.5)
-    sprockets (2.11.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)