Merge remote-tracking branch 'upstream/pull/2257'

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 32496e129ba67fbba417a796d355f64e28e60cd9..f9a0af7d4ed2ce9e2108be9ced7cd3b77217c3ba 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    aasm (5.0.2)
+    aasm (5.0.5)

       concurrent-ruby (~> 1.0)
     actioncable (5.2.3)
       actionpack (= 5.2.3)
       concurrent-ruby (~> 1.0)
     actioncable (5.2.3)
       actionpack (= 5.2.3)


@@ -40,7 +40,7 @@ GEM
       activemodel (= 5.2.3)
       activesupport (= 5.2.3)
       arel (>= 9.0)
       activemodel (= 5.2.3)
       activesupport (= 5.2.3)
       arel (>= 9.0)

-    activerecord-import (1.0.1)
+    activerecord-import (1.0.2)

       activerecord (>= 3.2)
     activestorage (5.2.3)
       actionpack (= 5.2.3)
       activerecord (>= 3.2)
     activestorage (5.2.3)
       actionpack (= 5.2.3)


@@ -53,8 +53,8 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)

-    annotate (2.7.4)
-      activerecord (>= 3.2, < 6.0)
+    annotate (2.7.5)
+      activerecord (>= 3.2, < 7.0)

       rake (>= 10.4, < 13.0)
     arel (9.0.0)
     ast (2.4.0)
       rake (>= 10.4, < 13.0)
     arel (9.0.0)
     ast (2.4.0)


@@ -75,11 +75,13 @@ GEM
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.4.2)
+    bootsnap (1.4.4)

       msgpack (~> 1.0)
     browser (2.5.3)
     builder (3.2.3)
       msgpack (~> 1.0)
     browser (2.5.3)
     builder (3.2.3)

-    cancancan (2.3.0)
+    bzip2-ffi (1.0.0)
+      ffi (~> 1.0)
+    cancancan (3.0.1)

     canonical-rails (0.2.5)
       rails (>= 4.1, < 6.1)
     capybara (2.18.0)
     canonical-rails (0.2.5)
       rails (>= 4.1, < 6.1)
     capybara (2.18.0)


@@ -99,6 +101,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)

+    colorize (0.8.1)

     composite_primary_keys (11.1.0)
       activerecord (~> 5.2.1)
     concurrent-ruby (1.1.5)
     composite_primary_keys (11.1.0)
       activerecord (~> 5.2.1)
     concurrent-ruby (1.1.5)


@@ -106,11 +109,11 @@ GEM
       activesupport (>= 3.0)
       deep_merge (~> 1.2.1)
       dry-validation (>= 0.12.2)
       activesupport (>= 3.0)
       deep_merge (~> 1.2.1)
       dry-validation (>= 0.12.2)

-    coveralls (0.8.22)
+    coveralls (0.8.23)

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

-      thor (~> 0.19.4)
+      thor (>= 0.19.4, < 2.0)

       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)


@@ -124,7 +127,7 @@ GEM
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
     docile (1.3.1)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
     docile (1.3.1)

-    dry-configurable (0.8.2)
+    dry-configurable (0.8.3)

       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
     dry-container (0.7.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
     dry-container (0.7.0)


@@ -134,8 +137,8 @@ GEM
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.2)
     dry-inflector (0.1.2)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.2)
     dry-inflector (0.1.2)

-    dry-logic (0.5.0)
-      dry-container (~> 0.2, >= 0.2.6)
+    dry-logic (0.6.1)
+      concurrent-ruby (~> 1.0)

       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
     dry-types (0.14.1)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
     dry-types (0.14.1)


@@ -145,7 +148,7 @@ GEM
       dry-equalizer (~> 0.2)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.5, >= 0.5)
       dry-equalizer (~> 0.2)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.5, >= 0.5)

-    dry-validation (0.13.1)
+    dry-validation (0.13.3)

       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)


@@ -161,60 +164,62 @@ GEM
       rubocop (~> 0.51)
       smart_properties
     erubi (1.8.0)
       rubocop (~> 0.51)
       smart_properties
     erubi (1.8.0)

+    eslint-rails-ee (1.0.2)
+      colorize
+      execjs
+      railties (>= 3.2)

     execjs (2.7.0)
     exifr (1.3.6)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
     execjs (2.7.0)
     exifr (1.3.6)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)

-    factory_bot_rails (5.0.1)
-      factory_bot (~> 5.0.0)
+    factory_bot_rails (5.0.2)
+      factory_bot (~> 5.0.2)

       railties (>= 4.2.0)
       railties (>= 4.2.0)

-    fakefs (0.20.0)
+    fakefs (0.20.1)

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

-    ffi (1.10.0)
-    fspath (3.1.0)
-    gd2-ffij (0.3.0)
+    ffi (1.11.1)
+    ffi-libarchive (0.4.6)
+      ffi (~> 1.0)
+    fspath (3.1.1)
+    gd2-ffij (0.4.0)

       ffi (>= 1.0.0)
     geoip (1.6.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
       ffi (>= 1.0.0)
     geoip (1.6.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)

-    hashdiff (0.3.8)
+    hashdiff (0.4.0)

     hashie (3.6.0)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     hashie (3.6.0)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.2.1)
+    i18n-js (3.2.3)

       i18n (>= 0.6.6)
       i18n (>= 0.6.6)

-    image_optim (0.26.3)
+    image_optim (0.26.4)

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

-    image_optim_rails (0.4.1)
+    image_optim_rails (0.4.2)

       image_optim (~> 0.24)
       rails
       sprockets
       image_optim (~> 0.24)
       rails
       sprockets

-    image_size (2.0.0)
-    in_threads (1.5.1)
+    image_size (2.0.1)
+    in_threads (1.5.2)

     jaro_winkler (1.5.2)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jaro_winkler (1.5.2)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)

-    jshint (1.5.0)
-      execjs (>= 1.4.0)
-      multi_json (~> 1.0)
-      therubyracer (~> 0.12.1)

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

-    jwt (2.1.0)
+    jwt (2.2.1)

     kgio (2.11.2)
     kramdown (2.1.0)
     libv8 (3.16.14.19)
     kgio (2.11.2)
     kramdown (2.1.0)
     libv8 (3.16.14.19)


@@ -238,17 +243,17 @@ GEM
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)

-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)

     mimemagic (0.3.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     mimemagic (0.3.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)

-    msgpack (1.2.9)
+    msgpack (1.2.10)

     multi_json (1.13.1)
     multi_xml (0.6.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)

-    multipart-post (2.0.0)
+    multipart-post (2.1.1)

     nio4r (2.3.1)
     nio4r (2.3.1)

-    nokogiri (1.10.2)
+    nokogiri (1.10.3)

       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
       nokogiri (~> 1.8, >= 1.8.4)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
       nokogiri (~> 1.8, >= 1.8.4)


@@ -272,7 +277,7 @@ GEM
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)

-    omniauth-google-oauth2 (0.6.1)
+    omniauth-google-oauth2 (0.7.0)

       jwt (>= 2.0)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.5)
       jwt (>= 2.0)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.5)


@@ -298,21 +303,21 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)

-    parallel (1.16.0)
-    parser (2.6.2.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)

       ast (~> 2.4.0)
       ast (~> 2.4.0)

-    pg (0.21.0)
+    pg (1.1.4)

     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)

-    progress (3.5.0)
+    progress (3.5.1)

     psych (3.1.0)
     psych (3.1.0)

-    public_suffix (3.0.3)
+    public_suffix (3.1.0)

     puma (3.12.1)
     quad_tile (1.0.1)
     r2 (0.2.7)
     puma (3.12.1)
     quad_tile (1.0.1)
     r2 (0.2.7)

-    rack (2.0.6)
+    rack (2.0.7)

     rack-cors (1.0.3)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
     rack-cors (1.0.3)
     rack-openid (1.3.1)
       rack (>= 1.1.0)


@@ -361,19 +366,23 @@ GEM
     ref (2.0.0)
     request_store (1.4.1)
       rack (>= 1.4)
     ref (2.0.0)
     request_store (1.4.1)
       rack (>= 1.4)

-    rinku (2.0.4)
-    rotp (4.1.0)
+    rinku (2.0.6)
+    rotp (5.0.0)

       addressable (~> 2.5)
       addressable (~> 2.5)

-    rubocop (0.66.0)
+    rubocop (0.71.0)

       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)

-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 2.6)

       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)

-      unicode-display_width (>= 1.4.0, < 1.6)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.3.0)
+      rubocop (>= 0.68.0)
+    rubocop-rails (2.0.0)
+      rack (>= 2.0)
+      rubocop (>= 0.70.0)

     ruby-openid (2.7.0)
     ruby-openid (2.7.0)

-    ruby-progressbar (1.10.0)
+    ruby-progressbar (1.10.1)

     ruby_dep (1.5.0)
     safe_yaml (1.0.5)
     sanitize (5.0.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.5)
     sanitize (5.0.0)


@@ -383,7 +392,7 @@ GEM
     sassc (2.0.1)
       ffi (~> 1.9)
       rake
     sassc (2.0.1)
       ffi (~> 1.9)
       rake

-    sassc-rails (2.1.0)
+    sassc-rails (2.1.1)

       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)


@@ -395,7 +404,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)

-    smart_properties (1.13.1)
+    smart_properties (1.14.0)

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


@@ -403,6 +412,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

+    strong_migrations (0.4.0)
+      activerecord (>= 5)

     term-ansicolor (1.7.1)
       tins (~> 1.0)
     terrapin (0.6.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     terrapin (0.6.0)


@@ -410,22 +421,22 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref

-    thor (0.19.4)
+    thor (0.20.3)

     thread_safe (0.3.6)
     tilt (2.0.9)
     thread_safe (0.3.6)
     tilt (2.0.9)

-    tins (1.20.2)
+    tins (1.20.3)

     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)

-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)

     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)

-    webmock (3.5.1)
+    webmock (3.6.0)

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

-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)

     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)


@@ -448,6 +459,7 @@ DEPENDENCIES
   binding_of_caller
   bootsnap (>= 1.1.0)
   browser
   binding_of_caller
   bootsnap (>= 1.1.0)
   browser

+  bzip2-ffi

   cancancan
   canonical-rails
   capybara (~> 2.13)
   cancancan
   canonical-rails
   capybara (~> 2.13)


@@ -459,17 +471,19 @@ DEPENDENCIES
   delayed_job_active_record
   dynamic_form
   erb_lint
   delayed_job_active_record
   dynamic_form
   erb_lint

+  eslint-rails-ee
+  execjs

   factory_bot_rails
   fakefs
   faraday
   factory_bot_rails
   fakefs
   faraday

-  gd2-ffij
+  ffi-libarchive
+  gd2-ffij (>= 0.4.0)

   geoip
   htmlentities
   http_accept_language (~> 2.0.0)
   i18n-js (>= 3.0.0)
   image_optim_rails
   jquery-rails
   geoip
   htmlentities
   http_accept_language (~> 2.0.0)
   i18n-js (>= 3.0.0)
   image_optim_rails
   jquery-rails

-  jshint

   json
   jsonify-rails
   kgio
   json
   jsonify-rails
   kgio


@@ -477,6 +491,7 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
   libxml-ruby (>= 2.0.5)
   listen
   logstasher

+  mimemagic

   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   omniauth
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   omniauth


@@ -488,7 +503,7 @@ DEPENDENCIES
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.0)
   paperclip (~> 5.2)
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.0)
   paperclip (~> 5.2)

-  pg (~> 0.18)
+  pg

   poltergeist
   psych
   puma (~> 3.7)
   poltergeist
   psych
   puma (~> 3.7)


@@ -500,16 +515,20 @@ DEPENDENCIES
   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper
   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper

-  rinku (= 2.0.4)
+  rinku (>= 2.0.6)

   rotp
   rubocop
   rotp
   rubocop

+  rubocop-performance
+  rubocop-rails

   sanitize
   sassc-rails
   secure_headers
   sanitize
   sassc-rails
   secure_headers

+  strong_migrations
+  therubyracer

   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   vendorer
   webmock
 
 BUNDLED WITH
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   vendorer
   webmock
 
 BUNDLED WITH

-   1.16.2
+   1.17.2