X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/21d713005ff57df8d3069bd9caf322b7debaf053..e825f8b2647fb1bc62fb017149930b94ec4d4ea2:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 08bb2f1c3..dd565f1ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,27 +2,27 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (4.0.1)
-      actionpack (= 4.0.1)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
       mail (~> 2.5.4)
-    actionpack (4.0.1)
-      activesupport (= 4.0.1)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
       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)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
+      activesupport (= 4.0.2)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -43,22 +43,20 @@ 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)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     hike (1.2.3)
     htmlentities (4.3.1)
     http_accept_language (2.0.0)
-    httpauth (0.2.0)
     httpclient (2.3.4.1)
-    i18n (0.6.5)
+    i18n (0.6.9)
     iconv (0.1)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
@@ -69,20 +67,20 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
-    jwt (0.1.8)
+    jwt (0.1.11)
       multi_json (>= 1.5)
     kgio (2.8.1)
     libxml-ruby (2.7.0)
     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)
+    multi_json (1.8.4)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
     oauth-plugin (0.5.1)
@@ -90,62 +88,61 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     open_id_authentication (1.2.0)
       rack-openid (~> 1.3)
-    openstreetmap-i18n-js (3.0.0.rc5.2)
+    openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n
     paperclip (3.5.2)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    pg (0.17.0)
+    pg (0.17.1)
     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)
       rack (>= 1.0)
-    rails (4.0.1)
-      actionmailer (= 4.0.1)
-      actionpack (= 4.0.1)
-      activerecord (= 4.0.1)
-      activesupport (= 4.0.1)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.1)
+      railties (= 4.0.2)
       sprockets-rails (~> 2.0.0)
-    rails-i18n (4.0.0)
+    rails-i18n (4.0.1)
       i18n (~> 0.6)
-      rails (~> 4.0.0)
-    railties (4.0.1)
-      actionpack (= 4.0.1)
-      activesupport (= 4.0.1)
+      rails (~> 4.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.1.1)
     redcarpet (3.0.0)
     rinku (1.7.3)
     ruby-openid (2.3.0)
-    sanitize (2.0.6)
+    sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.2.12)
+    sass (3.2.13)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sprockets (2.10.0)
+    soap4r-ruby1.9 (2.0.5)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -158,12 +155,12 @@ GEM
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    timecop (0.6.3)
+    timecop (0.7.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)
-    uglifier (2.3.0)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     validates_email_format_of (1.5.3)
@@ -177,11 +174,10 @@ DEPENDENCIES
   actionpack-page_caching
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.0.0)
-  composite_primary_keys (>= 6.0.0)
-  dalli
+  composite_primary_keys (>= 6.0.1)
+  dalli (~> 2.6.4)
   deadlock_retry (>= 1.2.0)
   dynamic_form
-  ejs
   htmlentities
   http_accept_language (~> 2.0.0)
   httpclient
@@ -194,19 +190,20 @@ DEPENDENCIES
   minitest (~> 4.7.0)
   oauth-plugin (>= 0.5.1)
   open_id_authentication (>= 1.1.0)
-  openstreetmap-i18n-js (>= 3.0.0.rc5.2)
+  openstreetmap-i18n-js (>= 3.0.0.rc5.3)
   paperclip (~> 3.0)
   pg
   psych
   r2
   rack-cors
-  rails (= 4.0.1)
+  rails (= 4.0.2)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   ruby-openid (>= 2.2.0)
   sanitize
   sass-rails (~> 4.0.0)
+  soap4r-ruby1.9
   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)