X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8acdba8bdd2be14c2408518812660431fa9e59fb..cd128966946be4690c5ec5349200721f53cab769:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 99087080f..dfa191d95 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,19 +33,20 @@ 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
     coffee-script-source (1.1.2)
     composite_primary_keys (4.0.0)
       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)
@@ -69,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)
@@ -111,15 +112,18 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2)
     rdoc (3.9.4)
+    rinku (1.2.2)
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     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)
@@ -130,29 +134,29 @@ 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
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
-  arel (>= 2.0.9)
   coffee-rails (~> 3.1.0)
   composite_primary_keys (= 4.0.0)
+  dynamic_form
   httpclient
   libxml-ruby (>= 2.0.5)
-  oauth (>= 0.4.4)
-  oauth-plugin (>= 0.4.0.pre4)
+  oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)
   pg
   prototype-rails
   rails (= 3.1.0)
   rails-i18n-updater
+  rinku (>= 1.2.2)
   rmagick
   sanitize
   sass-rails (~> 3.1.0)