X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7ad58d1411289ad241a49abb87e414ff13b60173..0c2d538aa7394b3d040cbe40cc6b3f5d26de4850:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a16252f7..03b542f6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,9 +31,8 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)
-    browser (0.1.4)
-    builder (3.0.0)
-    cocaine (0.2.1)
+    builder (3.0.4)
+    cocaine (0.4.2)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -41,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)
@@ -53,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)
-    i18n (0.6.0)
-    i18n-js (3.0.0.rc2)
+    httpauth (0.2.0)
+    httpclient (2.3.0.1)
+    i18n (0.6.1)
+    i18n-js (3.0.0.rc3)
       i18n
     iconv (0.1)
     journey (1.0.4)
-    jquery-rails (2.1.1)
+    jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
@@ -72,13 +72,13 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.4.3)
+    memcached (1.4.6)
     mime-types (1.19)
-    minitest (3.3.0)
+    minitest (4.1.0)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
-    oauth (0.4.6)
+    oauth (0.4.7)
     oauth-plugin (0.4.1)
       multi_json
       oauth (~> 0.4.4)
@@ -92,22 +92,24 @@ 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)
       mime-types
-    pg (0.14.0)
+    pg (0.14.1)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-cors (0.2.7)
+      rack
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       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)
@@ -117,7 +119,7 @@ GEM
       activesupport (= 3.2.8)
       bundler (~> 1.0)
       railties (= 3.2.8)
-    rails-i18n (0.6.5)
+    rails-i18n (0.6.6)
       i18n (~> 0.5)
     railties (3.2.8)
       actionpack (= 3.2.8)
@@ -129,9 +131,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.2)
+    rinku (1.7.2)
+    ruby-openid (2.2.1)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     sass (3.2.1)
@@ -147,14 +149,14 @@ GEM
       libv8 (~> 3.3.10)
     thor (0.16.0)
     tilt (1.3.3)
-    timecop (0.4.5)
-    treetop (1.4.10)
+    timecop (0.5.3)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    uglifier (1.2.7)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
+      multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)
 
 PLATFORMS
@@ -163,11 +165,11 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal
-  browser
   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
@@ -181,6 +183,7 @@ DEPENDENCIES
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg
+  rack-cors
   rails (= 3.2.8)
   rails-i18n (>= 0.6.3)
   redcarpet