X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4d91fe3dd95c1058cb8d24fd4c900223e30b9059..00375024263970a43ea7d39e3c65dfd0f32e8869:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 666b6a094..23eeceb19 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
     arel (3.0.2)
     bigdecimal (1.1.0)
     builder (3.0.3)
-    cocaine (0.3.0)
+    cocaine (0.4.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -40,10 +40,11 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    composite_primary_keys (5.0.8)
-      activerecord (~> 3.2.0)
+    composite_primary_keys (5.0.9)
+      activerecord (~> 3.2.0, >= 3.2.8)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
+    ejs (1.1.1)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -52,14 +53,14 @@ GEM
     hike (1.2.1)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
-    httpauth (0.1)
-    httpclient (2.2.7)
+    httpauth (0.2.0)
+    httpclient (2.3.0.1)
     i18n (0.6.1)
     i18n-js (3.0.0.rc2)
       i18n
     iconv (0.1)
     journey (1.0.4)
-    jquery-rails (2.1.2)
+    jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
@@ -76,9 +77,9 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.4.5)
+    memcached (1.4.6)
     mime-types (1.19)
-    minitest (3.4.0)
+    minitest (4.1.0)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
@@ -96,7 +97,7 @@ GEM
       rack (~> 1.2)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
-    paperclip (2.7.0)
+    paperclip (2.8.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
@@ -111,7 +112,7 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.8)
       actionmailer (= 3.2.8)
@@ -133,9 +134,9 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redcarpet (2.1.1)
-    rinku (1.7.0)
-    ruby-openid (2.2.0)
+    redcarpet (2.2.1)
+    rinku (1.7.2)
+    ruby-openid (2.2.1)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     sass (3.2.1)
@@ -151,8 +152,8 @@ GEM
       libv8 (~> 3.3.10)
     thor (0.16.0)
     tilt (1.3.3)
-    timecop (0.5.1)
-    treetop (1.4.10)
+    timecop (0.5.2)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
@@ -168,9 +169,10 @@ DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal
   coffee-rails (~> 3.2.1)
-  composite_primary_keys (>= 5.0.8)
+  composite_primary_keys (>= 5.0.9)
   deadlock_retry (>= 1.2.0)
   dynamic_form
+  ejs
   htmlentities
   http_accept_language (>= 1.0.2)
   httpclient