Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 066e3023da1692fe5d759b5ec2cf5f20022d5c44..1fade149c7bf3f241373929eb609449faaa41403 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,59 +2,59 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (4.2.7)
-      actionpack (= 4.2.7)
-      actionview (= 4.2.7)
-      activejob (= 4.2.7)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)

       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)

-    actionpack (4.2.7)
-      actionview (= 4.2.7)
-      activesupport (= 4.2.7)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)

       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)

-    actionpack-page_caching (1.0.2)
-      actionpack (>= 4.0.0, < 5)
-    actionview (4.2.7)
-      activesupport (= 4.2.7)
+    actionpack-page_caching (1.1.0)
+      actionpack (>= 4.0.0, < 6)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)

       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)

-    activejob (4.2.7)
-      activesupport (= 4.2.7)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)

       globalid (>= 0.3.0)
       globalid (>= 0.3.0)

-    activemodel (4.2.7)
-      activesupport (= 4.2.7)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)

       builder (~> 3.1)
       builder (~> 3.1)

-    activerecord (4.2.7)
-      activemodel (= 4.2.7)
-      activesupport (= 4.2.7)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)

       arel (~> 6.0)
       arel (~> 6.0)

-    activesupport (4.2.7)
+    activesupport (4.2.7.1)

       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)

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

     ast (2.3.0)
     ast (2.3.0)

-    autoprefixer-rails (6.4.1.1)
+    autoprefixer-rails (6.7.2)

       execjs
     bigdecimal (1.1.0)
       execjs
     bigdecimal (1.1.0)

-    builder (3.2.2)
-    capybara (2.8.1)
+    builder (3.2.3)
+    capybara (2.12.0)

       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)

-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)

     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)


@@ -64,17 +64,19 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script (2.4.1)
       coffee-script-source
       execjs

-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)

     colorize (0.8.1)
     composite_primary_keys (8.1.4)
       activerecord (~> 4.2.0)
     colorize (0.8.1)
     composite_primary_keys (8.1.4)
       activerecord (~> 4.2.0)

-    concurrent-ruby (1.0.2)
-    coveralls (0.8.15)
+    concurrent-ruby (1.0.4)
+    coveralls (0.8.19)

       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)

-      tins (>= 1.6.0, < 2)
+      tins (~> 1.6)
+    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)


@@ -83,47 +85,52 @@ GEM
     erubis (2.7.0)
     execjs (2.7.0)
     exifr (1.2.5)
     erubis (2.7.0)
     execjs (2.7.0)
     exifr (1.2.5)

-    factory_girl (4.7.0)
+    factory_girl (4.8.0)

       activesupport (>= 3.0.0)
       activesupport (>= 3.0.0)

-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)

       railties (>= 3.0.0)
       railties (>= 3.0.0)

-    faraday (0.9.2)
+    faraday (0.10.1)

       multipart-post (>= 1.2, < 3)
     fspath (3.0.1)
       multipart-post (>= 1.2, < 3)
     fspath (3.0.1)

+    geoip (1.6.3)

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

-    hashie (3.4.4)
+    hashdiff (0.3.2)
+    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.8.0)
+    i18n-js (3.0.0.rc15)

       i18n (~> 0.6, >= 0.6.6)
       i18n (~> 0.6, >= 0.6.6)

-    image_optim (0.24.0)
+    image_optim (0.24.1)

       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)

-      image_size (~> 1.3)
+      image_size (~> 1.5)

       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)

-    image_size (1.4.2)
+    image_optim_rails (0.2.0)
+      image_optim (~> 0.24.0)
+      rails
+      sprockets
+    image_size (1.5.0)

     in_threads (1.3.1)
     in_threads (1.3.1)

-    jquery-rails (4.2.1)
+    jquery-rails (4.2.2)

       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
       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)

-    json (1.8.3)
+    json (1.8.6)

     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (1.5.4)
-    kgio (2.10.0)
+    jwt (1.5.6)
+    kgio (2.11.0)

     konacha (4.0.0)
       actionpack (>= 4.1, < 5)
       capybara
     konacha (4.0.0)
       actionpack (>= 4.1, < 5)
       capybara


@@ -132,10 +139,10 @@ GEM
       sprockets (>= 2, < 4)
       sprockets-rails (>= 2, < 4)
       tilt
       sprockets (>= 2, < 4)
       sprockets-rails (>= 2, < 4)
       tilt

-    libv8 (3.16.14.15)
+    libv8 (3.16.14.17)

     libxml-ruby (2.9.0)
     logstash-event (1.2.02)
     libxml-ruby (2.9.0)
     logstash-event (1.2.02)

-    logstasher (1.0.1)
+    logstasher (1.1.1)

       activerecord (>= 4.0)
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       activerecord (>= 4.0)
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)


@@ -149,14 +156,14 @@ 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.10.1)
+    minitest-stub_any_instance (1.0.1)

     multi_json (1.12.1)
     multi_json (1.12.1)

-    multi_xml (0.5.5)
+    multi_xml (0.6.0)

     multipart-post (2.0.0)
     multipart-post (2.0.0)

-    nokogiri (1.6.8)
+    nokogiri (1.7.0.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)


@@ -164,25 +171,31 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)

       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)

-    omniauth (1.3.1)
+    omniauth (1.3.2)

       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)

-    omniauth-github (1.1.2)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-github (1.2.0)
+      omniauth (~> 1.3.2)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)

     omniauth-google-oauth2 (0.4.1)
       jwt (~> 1.5.2)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.3.1)
     omniauth-google-oauth2 (0.4.1)
       jwt (~> 1.5.2)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.3.1)

+    omniauth-mediawiki (0.0.3)
+      jwt (~> 1.0)
+      omniauth-oauth (~> 1.0)
+    omniauth-oauth (1.1.0)
+      oauth
+      omniauth (~> 1.0)

     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)


@@ -198,72 +211,74 @@ 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.3.1)

       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.13.0)

       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.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)
+    progress (3.3.0)
+    psych (2.2.2)
+    public_suffix (2.0.5)

     r2 (0.2.6)
     r2 (0.2.6)

-    rack (1.6.4)
-    rack-cors (0.4.0)
+    rack (1.6.5)
+    rack-cors (0.4.1)

     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-uri_sanitizer (0.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-uri_sanitizer (0.0.2)

-    rails (4.2.7)
-      actionmailer (= 4.2.7)
-      actionpack (= 4.2.7)
-      actionview (= 4.2.7)
-      activejob (= 4.2.7)
-      activemodel (= 4.2.7)
-      activerecord (= 4.2.7)
-      activesupport (= 4.2.7)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)

       bundler (>= 1.3.0, < 2.0)
       bundler (>= 1.3.0, < 2.0)

-      railties (= 4.2.7)
+      railties (= 4.2.7.1)

       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)

-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)

       activesupport (>= 4.2.0.beta, < 5.0)
       activesupport (>= 4.2.0.beta, < 5.0)

-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)

       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)

-    railties (4.2.7)
-      actionpack (= 4.2.7)
-      activesupport (= 4.2.7)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)

       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)

-    rainbow (2.1.0)
-    rake (11.2.2)
-    redcarpet (3.3.4)
+    rainbow (2.2.1)
+    rake (12.0.0)
+    redcarpet (3.4.0)

     ref (2.0.0)
     ref (2.0.0)

-    request_store (1.3.1)
-    rinku (2.0.0)
-    rubocop (0.42.0)
-      parser (>= 2.3.1.1, < 3.0)
+    request_store (1.3.2)
+    rinku (2.0.2)
+    rotp (3.3.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)

       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-openid (2.7.0)
     ruby-progressbar (1.8.1)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       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)

-    sass (3.4.22)
+    sass (3.4.23)

     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)


@@ -275,33 +290,36 @@ 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)
+    sprockets (3.7.1)

       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

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

       tins (~> 1.0)
       tins (~> 1.0)

-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)

       ref
       ref

-    thor (0.19.1)
+    thor (0.19.4)

     thread_safe (0.3.5)
     thread_safe (0.3.5)

-    tilt (2.0.5)
+    tilt (2.0.6)

     timecop (0.8.1)
     timecop (0.8.1)

-    tins (1.12.0)
+    tins (1.13.2)

     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

-    uglifier (3.0.2)
+    uglifier (3.0.4)

       execjs (>= 0.3.0, < 3)
       execjs (>= 0.3.0, < 3)

-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.3)

     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)

-    websocket-driver (0.6.4)
+    webmock (2.3.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket-driver (0.6.5)

       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)


@@ -323,11 +341,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


@@ -337,11 +355,13 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   logstasher
   minitest (~> 5.1)
   libxml-ruby (>= 2.0.5)
   logstasher
   minitest (~> 5.1)

+  minitest-stub_any_instance

   oauth-plugin (>= 0.5.1)
   omniauth
   omniauth-facebook
   omniauth-github
   omniauth-google-oauth2 (>= 0.2.7)
   oauth-plugin (>= 0.5.1)
   omniauth
   omniauth-facebook
   omniauth-github
   omniauth-google-oauth2 (>= 0.2.7)

+  omniauth-mediawiki (>= 0.0.3)

   omniauth-openid
   omniauth-windowslive
   paperclip (~> 4.0)
   omniauth-openid
   omniauth-windowslive
   paperclip (~> 4.0)


@@ -351,18 +371,19 @@ DEPENDENCIES
   r2
   rack-cors
   rack-uri_sanitizer
   r2
   rack-cors
   rack-uri_sanitizer

-  rails (= 4.2.7)
+  rails (= 4.2.7.1)

   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)

+  rotp

   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