From: Tom Hughes <tom@compton.nu>
Date: Thu, 29 Sep 2011 23:20:57 +0000 (+0100)
Subject: Update bundle
X-Git-Tag: live~6088
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1132dd36e33f888654102696eb1d5386816c0f19?hp=7f19bade8ee72d77a2e229f4f0ccc863e01d6421

Update bundle
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 5ed770528..89d57d022 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,11 +33,11 @@ GEM
       multi_json (~> 1.0)
     addressable (2.2.6)
     arel (2.2.1)
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    coffee-rails (3.1.0)
+    coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.1.0.rc1)
+      railties (~> 3.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -46,7 +46,7 @@ GEM
       activerecord (~> 3.1.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
-    execjs (1.2.4)
+    execjs (1.2.9)
       multi_json (~> 1.0)
     faraday (0.7.4)
       addressable (~> 2.2.6)
@@ -70,16 +70,16 @@ GEM
       oauth (~> 0.4.4)
       oauth2
       rack
-    oauth2 (0.5.0)
-      faraday (< 0.8, >= 0.6.1)
-      multi_json (~> 1.0.0)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
     pg (0.11.0)
     polyglot (0.3.2)
     prototype-rails (3.1.0)
       rails (~> 3.1)
-    rack (1.3.2)
+    rack (1.3.3)
     rack-cache (1.0.3)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -118,10 +118,12 @@ GEM
     sanitize (2.0.3)
       nokogiri (< 1.6, >= 1.4.4)
     sass (3.1.7)
-    sass-rails (3.1.0)
+    sass-rails (3.1.3)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
+      tilt (~> 1.3.2)
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -132,11 +134,11 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-    uglifier (1.0.2)
+    tzinfo (0.3.30)
+    uglifier (1.0.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    validates_email_format_of (1.5.1)
+    validates_email_format_of (1.5.2)
 
 PLATFORMS
   ruby