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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 1e0e7a8706ba9e04f7448761bb0bdfc84ec9b1dd..03b033199303d99ded745205859e6cf9eb9ff224 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,40 +2,39 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

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

       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.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)

       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.1)
-      activesupport (= 4.2.7.1)
+    actionpack-page_caching (1.1.0)
+      actionpack (>= 4.0.0, < 6)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)

       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       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.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)

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

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

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

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

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

-    activesupport (4.2.7.1)
+    activesupport (4.2.8)

       i18n (~> 0.7)
       i18n (~> 0.7)

-      json (~> 1.7, >= 1.7.7)

       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)


@@ -43,19 +42,20 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.4)
     ast (2.3.0)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.4)
     ast (2.3.0)

-    autoprefixer-rails (6.6.0)
+    autoprefixer-rails (6.7.7.1)

       execjs
     bigdecimal (1.1.0)
       execjs
     bigdecimal (1.1.0)

-    builder (3.2.2)
-    capybara (2.11.0)
+    builder (3.2.3)
+    canonical-rails (0.1.2)
+      rails (>= 4.1, < 5.1)
+    capybara (2.13.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)


@@ -69,8 +69,8 @@ GEM
     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.4)
-    coveralls (0.8.17)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.19)

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


@@ -91,32 +91,32 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)

-    faraday (0.10.1)
+    faraday (0.11.0)

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

-    fspath (3.0.1)
-    geoip (1.6.2)
+    fspath (3.1.0)
+    geoip (1.6.3)

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

-    hashie (3.4.6)
+    hashie (3.5.5)

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

-    i18n (0.7.0)
-    i18n-js (3.0.0.rc15)
+    i18n (0.8.1)
+    i18n-js (3.0.0.rc16)

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

-    image_optim (0.24.1)
+    image_optim (0.24.2)

       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)

-    image_optim_rails (0.2.0)
+    image_optim_rails (0.3.0)

       image_optim (~> 0.24.0)
       rails
       sprockets
     image_size (1.5.0)
       image_optim (~> 0.24.0)
       rails
       sprockets
     image_size (1.5.0)

-    in_threads (1.3.1)
-    jquery-rails (4.2.2)
+    in_threads (1.4.0)
+    jquery-rails (4.3.1)

       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)


@@ -124,7 +124,7 @@ GEM
       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 (2.0.3)

     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)


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

-    libv8 (3.16.14.17)
-    libxml-ruby (2.9.0)
+    libv8 (3.16.14.19)
+    libxml-ruby (3.0.0)

     logstash-event (1.2.02)
     logstash-event (1.2.02)

-    logstasher (1.1.0)
-      activerecord (>= 4.0)
+    logstasher (1.2.1)

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


@@ -161,9 +160,9 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)

-    nokogiri (1.7.0)
+    nokogiri (1.7.1)

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

-    nokogumbo (1.4.10)
+    nokogumbo (1.4.9)

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


@@ -177,14 +176,14 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)

-    omniauth (1.3.1)
-      hashie (>= 1.2, < 4)
-      rack (>= 1.0, < 3)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)

     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
     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.3)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)

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


@@ -202,8 +201,8 @@ GEM
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)

-    omniauth-windowslive (0.0.11)
-      multi_json (>= 1.0.3)
+    omniauth-windowslive (0.0.12)
+      multi_json (~> 1.12)

       omniauth-oauth2 (~> 1.4)
     paperclip (4.3.7)
       activemodel (>= 3.2.0)
       omniauth-oauth2 (~> 1.4)
     paperclip (4.3.7)
       activemodel (>= 3.2.0)


@@ -211,36 +210,36 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)

-    parser (2.3.3.1)
+    parser (2.4.0.0)

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

-    pg (0.19.0)
-    poltergeist (1.12.0)
+    pg (0.20.0)
+    poltergeist (1.14.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.2.2)
-    public_suffix (2.0.4)
+    progress (3.3.1)
+    psych (2.2.4)
+    public_suffix (2.0.5)

     r2 (0.2.6)
     rack (1.6.5)
     r2 (0.2.6)
     rack (1.6.5)

-    rack-cors (0.4.0)
+    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.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)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)

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

-      railties (= 4.2.7.1)
+      railties (= 4.2.8)

       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)


@@ -253,19 +252,20 @@ GEM
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)

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

       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.1)
     rake (12.0.0)
     redcarpet (3.4.0)
     ref (2.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.1)
     rake (12.0.0)
     redcarpet (3.4.0)
     ref (2.0.0)

-    request_store (1.3.1)
+    request_store (1.3.2)

     rinku (2.0.2)
     rinku (2.0.2)

-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+    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)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)


@@ -284,6 +284,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)

+    secure_headers (3.6.2)
+      useragent

     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)


@@ -298,27 +300,28 @@ GEM
       sprockets (>= 3.0.0)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
       sprockets (>= 3.0.0)
     term-ansicolor (1.4.0)
       tins (~> 1.0)

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

       ref
     thor (0.19.4)
       ref
     thor (0.19.4)

-    thread_safe (0.3.5)
-    tilt (2.0.5)
+    thread_safe (0.3.6)
+    tilt (2.0.7)

     timecop (0.8.1)
     timecop (0.8.1)

-    tins (1.13.0)
+    tins (1.13.2)

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

-    uglifier (3.0.4)
+    uglifier (3.1.9)

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

-    unicode-display_width (1.1.2)
+    unicode-display_width (1.1.3)
+    useragent (0.16.8)

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

-    webmock (2.3.1)
+    webmock (2.3.2)

       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

-    websocket-driver (0.6.4)
+    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)


@@ -332,6 +335,7 @@ DEPENDENCIES
   actionpack-page_caching
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   actionpack-page_caching
   autoprefixer-rails
   bigdecimal (~> 1.1.0)

+  canonical-rails

   coffee-rails (~> 4.1.0)
   composite_primary_keys (~> 8.1.0)
   coveralls
   coffee-rails (~> 4.1.0)
   composite_primary_keys (~> 8.1.0)
   coveralls


@@ -369,13 +373,15 @@ DEPENDENCIES
   r2
   rack-cors
   rack-uri_sanitizer
   r2
   rack-cors
   rack-uri_sanitizer

-  rails (= 4.2.7.1)
+  rails (= 4.2.8)

   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)

+  secure_headers

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