X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a8e04f018a4b4458054d9bd1b2c87e1a3c34d513..b76bfe379e6527c9cfc2ced97aa615f8c2c45dd7:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index cc73ba00c..d3b1757e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,24 +42,23 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)
-    dalli (2.6.4)
+    dalli (2.7.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     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)
+    http_accept_language (2.0.1)
     httpclient (2.3.4.1)
     i18n (0.6.9)
     iconv (0.1)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -68,7 +67,7 @@ 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)
@@ -78,9 +77,9 @@ GEM
     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)
+    multipart-post (2.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
@@ -89,18 +88,17 @@ 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.3)
       i18n
-    paperclip (3.5.2)
+    paperclip (3.5.3)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -111,7 +109,7 @@ GEM
     r2 (0.2.2)
     rack (1.5.2)
     rack-cors (0.2.9)
-    rack-openid (1.4.1)
+    rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
@@ -135,14 +133,15 @@ GEM
     rake (10.1.1)
     redcarpet (3.0.0)
     rinku (1.7.3)
-    ruby-openid (2.3.0)
-    sanitize (2.0.6)
+    ruby-openid (2.5.0)
+    sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.2.13)
+    sass (3.2.14)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
+    soap4r-ruby1.9 (2.0.5)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -156,7 +155,7 @@ GEM
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    timecop (0.7.0)
+    timecop (0.7.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -204,6 +203,7 @@ DEPENDENCIES
   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)