X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2b4f8e92c969a5508b73ae7af45811a118fda6b1..944f3ebb67098f68d8524b4b993dbff9f308c0d9:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 08bb2f1c3..2065dabdd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,7 +11,7 @@ GEM
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionpack-page_caching (1.0.1)
+    actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
     activemodel (4.0.1)
       activesupport (= 4.0.1)
@@ -43,12 +43,11 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-    composite_primary_keys (6.0.0)
+    composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)
     dalli (2.6.4)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
-    ejs (1.1.1)
     erubis (2.7.0)
     execjs (2.0.2)
     faraday (0.8.8)
@@ -76,7 +75,7 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.25)
+    mime-types (1.25.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
     multi_json (1.8.2)
@@ -108,12 +107,11 @@ GEM
       mime-types
     pg (0.17.0)
     polyglot (0.3.3)
-    psych (2.0.1)
+    psych (2.0.2)
     r2 (0.2.2)
     rack (1.5.2)
-    rack-cors (0.2.8)
-      rack
-    rack-openid (1.4.0)
+    rack-cors (0.2.9)
+    rack-openid (1.4.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
@@ -145,7 +143,7 @@ GEM
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sprockets (2.10.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -158,12 +156,12 @@ GEM
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    timecop (0.6.3)
+    timecop (0.7.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)
-    uglifier (2.3.0)
+    uglifier (2.3.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     validates_email_format_of (1.5.3)
@@ -177,11 +175,10 @@ DEPENDENCIES
   actionpack-page_caching
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.0.0)
-  composite_primary_keys (>= 6.0.0)
+  composite_primary_keys (>= 6.0.1)
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
-  ejs
   htmlentities
   http_accept_language (~> 2.0.0)
   httpclient