Merge remote-tracking branch 'openstreetmap/pull/1375'

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 9f9966e9077f33aed273d650b02010a2d4a82d6c..ccf1438efde30a166fd7977cb305fde89441bfc9 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,14 +39,15 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)

-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)

     arel (6.0.3)
     ast (2.3.0)
     arel (6.0.3)
     ast (2.3.0)

-    autoprefixer-rails (6.4.1.1)
+    autoprefixer-rails (6.5.2)

       execjs
     bigdecimal (1.1.0)
     builder (3.2.2)
       execjs
     bigdecimal (1.1.0)
     builder (3.2.2)

-    capybara (2.8.1)
+    capybara (2.10.1)

       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)


@@ -75,6 +76,8 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (>= 1.6.0, < 2)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (>= 1.6.0, < 2)

+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)

     crass (1.0.2)
     dalli (2.7.6)
     deadlock_retry (1.2.0)
     crass (1.0.2)
     dalli (2.7.6)
     deadlock_retry (1.2.0)


@@ -91,12 +94,13 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fspath (3.0.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fspath (3.0.1)

+    geoip (1.6.2)

     globalid (0.3.7)
       activesupport (>= 4.1.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)

-    hashie (3.4.4)
+    hashdiff (0.3.0)
+    hashie (3.4.6)

     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)

-    httpclient (2.8.2.4)

     i18n (0.7.0)
     i18n-js (3.0.0.rc14)
       i18n (~> 0.6, >= 0.6.6)
     i18n (0.7.0)
     i18n-js (3.0.0.rc14)
       i18n (~> 0.6, >= 0.6.6)


@@ -106,13 +110,17 @@ GEM
       image_size (~> 1.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
       image_size (~> 1.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)

+    image_optim_rails (0.2.0)
+      image_optim (~> 0.24.0)
+      rails
+      sprockets

     image_size (1.4.2)
     in_threads (1.3.1)
     jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     image_size (1.4.2)
     in_threads (1.3.1)
     jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)

-    jshint (1.4.0)
+    jshint (1.5.0)

       execjs (>= 1.4.0)
       multi_json (~> 1.0)
       therubyracer (~> 0.12.1)
       execjs (>= 1.4.0)
       multi_json (~> 1.0)
       therubyracer (~> 0.12.1)


@@ -122,7 +130,7 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (1.5.4)
+    jwt (1.5.6)

     kgio (2.10.0)
     konacha (4.0.0)
       actionpack (>= 4.1, < 5)
     kgio (2.10.0)
     konacha (4.0.0)
       actionpack (>= 4.1, < 5)


@@ -149,14 +157,13 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)

-    minitest (5.9.0)
+    minitest (5.9.1)

     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)

-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)

       mini_portile2 (~> 2.1.0)
       mini_portile2 (~> 2.1.0)

-      pkg-config (~> 1.1.7)
-    nokogumbo (1.4.9)
+    nokogumbo (1.4.10)

       nokogiri
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       nokogiri
     oauth (0.4.7)
     oauth-plugin (0.5.1)


@@ -198,17 +205,17 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)

-    parser (2.3.1.2)
+    parser (2.3.1.4)

       ast (~> 2.2)
       ast (~> 2.2)

-    pg (0.18.4)
-    pkg-config (1.1.7)
-    poltergeist (1.10.0)
+    pg (0.19.0)
+    poltergeist (1.11.0)

       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
     progress (3.2.2)
     psych (2.1.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
     progress (3.2.2)
     psych (2.1.1)

+    public_suffix (2.0.4)

     r2 (0.2.6)
     rack (1.6.4)
     rack-cors (0.4.0)
     r2 (0.2.6)
     rack (1.6.4)
     rack-cors (0.4.0)


@@ -246,12 +253,12 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)

-    rake (11.2.2)
+    rake (11.3.0)

     redcarpet (3.3.4)
     ref (2.0.0)
     request_store (1.3.1)
     redcarpet (3.3.4)
     ref (2.0.0)
     request_store (1.3.1)

-    rinku (2.0.0)
-    rubocop (0.42.0)
+    rinku (2.0.2)
+    rubocop (0.45.0)

       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)


@@ -259,7 +266,8 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-openid (2.7.0)
     ruby-progressbar (1.8.1)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-openid (2.7.0)
     ruby-progressbar (1.8.1)

-    sanitize (4.2.0)
+    safe_yaml (1.0.4)
+    sanitize (4.4.0)

       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)


@@ -275,7 +283,6 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)

-    soap4r-ruby1.9 (2.0.5)

     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)


@@ -283,7 +290,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

-    term-ansicolor (1.3.2)
+    term-ansicolor (1.4.0)

       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)


@@ -295,12 +302,16 @@ GEM
     tins (1.12.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tins (1.12.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

-    uglifier (3.0.2)
+    uglifier (3.0.3)

       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.1)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.1)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)

+    webmock (2.1.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff

     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)


@@ -323,11 +334,11 @@ DEPENDENCIES
   dynamic_form
   factory_girl_rails
   faraday
   dynamic_form
   factory_girl_rails
   faraday

+  geoip

   htmlentities
   http_accept_language (~> 2.0.0)
   htmlentities
   http_accept_language (~> 2.0.0)

-  httpclient

   i18n-js (>= 3.0.0.rc10)
   i18n-js (>= 3.0.0.rc10)

-  image_optim (>= 0.22.0)
+  image_optim_rails

   jquery-rails
   jshint
   json
   jquery-rails
   jshint
   json


@@ -358,11 +369,11 @@ DEPENDENCIES
   rubocop
   sanitize
   sass-rails (~> 5.0)
   rubocop
   sanitize
   sass-rails (~> 5.0)

-  soap4r-ruby1.9

   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   vendorer
   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   vendorer

+  webmock

 
 BUNDLED WITH
 
 BUNDLED WITH

-   1.10.6
+   1.12.5