X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a08d6b1a4e85e33d9fc41d94906ef981fe51c37e..c0b47c0c2a3c31b42ef946aa6e07b85305091a0c:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index d571f26f6..03b542f6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,8 +31,8 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)
-    builder (3.0.3)
-    cocaine (0.3.2)
+    builder (3.0.4)
+    cocaine (0.4.2)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -44,6 +44,7 @@ GEM
       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,9 +54,9 @@ GEM
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)
-    httpclient (2.2.7)
+    httpclient (2.3.0.1)
     i18n (0.6.1)
-    i18n-js (3.0.0.rc2)
+    i18n-js (3.0.0.rc3)
       i18n
     iconv (0.1)
     journey (1.0.4)
@@ -73,7 +74,7 @@ GEM
       treetop (~> 1.4.8)
     memcached (1.4.6)
     mime-types (1.19)
-    minitest (4.0.0)
+    minitest (4.1.0)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
@@ -91,7 +92,7 @@ GEM
       rack (~> 1.2)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
-    paperclip (2.7.1)
+    paperclip (2.8.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
@@ -101,6 +102,8 @@ GEM
     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)
@@ -128,8 +131,8 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redcarpet (2.1.1)
-    rinku (1.7.0)
+    redcarpet (2.2.2)
+    rinku (1.7.2)
     ruby-openid (2.2.1)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
@@ -146,8 +149,8 @@ GEM
       libv8 (~> 3.3.10)
     thor (0.16.0)
     tilt (1.3.3)
-    timecop (0.5.2)
-    treetop (1.4.10)
+    timecop (0.5.3)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
@@ -166,6 +169,7 @@ DEPENDENCIES
   composite_primary_keys (>= 5.0.9)
   deadlock_retry (>= 1.2.0)
   dynamic_form
+  ejs
   htmlentities
   http_accept_language (>= 1.0.2)
   httpclient
@@ -179,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