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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index f21148fee790a1cc3e3721a7c3a07284ee9dbe6e..a4104c53625bb0822be5448ec7c09b8b1c5db4f6 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,11 +60,27 @@ GEM
     ast (2.4.0)
     autoprefixer-rails (8.6.5)
       execjs
     ast (2.4.0)
     autoprefixer-rails (8.6.5)
       execjs

+    aws-eventstream (1.0.3)
+    aws-partitions (1.206.0)
+    aws-sdk-core (3.64.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.24.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.46.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)

     better_errors (2.5.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     better_errors (2.5.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)

-    better_html (1.0.13)
+    better_html (1.0.14)

       actionview (>= 4.0)
       activesupport (>= 4.0)
       ast (~> 2.0)
       actionview (>= 4.0)
       activesupport (>= 4.0)
       ast (~> 2.0)


@@ -77,10 +93,12 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.4)
       msgpack (~> 1.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.4)
       msgpack (~> 1.0)

-    browser (2.5.3)
+    browser (2.6.1)

     builder (3.2.3)
     builder (3.2.3)

+    bzip2-ffi (1.0.0)
+      ffi (~> 1.0)

     cancancan (3.0.1)
     cancancan (3.0.1)

-    canonical-rails (0.2.5)
+    canonical-rails (0.2.6)

       rails (>= 4.1, < 6.1)
     capybara (2.18.0)
       addressable
       rails (>= 4.1, < 6.1)
     capybara (2.18.0)
       addressable


@@ -89,7 +107,6 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)

-    climate_control (0.2.0)

     cliver (0.3.2)
     coderay (1.1.2)
     coffee-rails (4.2.2)
     cliver (0.3.2)
     coderay (1.1.2)
     coffee-rails (4.2.2)


@@ -99,14 +116,13 @@ 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)

-    config (1.7.1)
-      activesupport (>= 3.0)
-      deep_merge (~> 1.2.1)
-      dry-validation (>= 0.12.2)
+    config (2.0.0)
+      activesupport (>= 4.2)
+      deep_merge (~> 1.2, >= 1.2.1)
+      dry-schema (~> 1.0)

     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)


@@ -119,42 +135,44 @@ GEM
     dalli (2.7.10)
     debug_inspector (0.0.3)
     deep_merge (1.2.1)
     dalli (2.7.10)
     debug_inspector (0.0.3)
     deep_merge (1.2.1)

-    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.3)
-    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.3)
+    delayed_job (4.1.8)
+      activesupport (>= 3.0, < 6.1)
+    delayed_job_active_record (4.1.4)
+      activerecord (>= 3.0, < 6.1)

       delayed_job (>= 3.0, < 5)
       delayed_job (>= 3.0, < 5)

-    docile (1.3.1)
+    docile (1.3.2)

     dry-configurable (0.8.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
     dry-configurable (0.8.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)

-    dry-container (0.7.0)
+    dry-container (0.7.2)

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

-    dry-core (0.4.7)
+    dry-core (0.4.9)

       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.6.1)
+    dry-initializer (3.0.1)
+    dry-logic (1.0.3)

       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)

-    dry-types (0.14.1)
+    dry-schema (1.3.3)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.8, >= 0.8.3)
+      dry-core (~> 0.4)
+      dry-equalizer (~> 0.2)
+      dry-initializer (~> 3.0)
+      dry-logic (~> 1.0)
+      dry-types (~> 1.0)
+    dry-types (1.1.1)

       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)

-      dry-equalizer (~> 0.2)
+      dry-equalizer (~> 0.2, >= 0.2.2)

       dry-inflector (~> 0.1, >= 0.1.2)
       dry-inflector (~> 0.1, >= 0.1.2)

-      dry-logic (~> 0.5, >= 0.5)
-    dry-validation (0.13.3)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-      dry-core (~> 0.2, >= 0.2.1)
-      dry-equalizer (~> 0.2)
-      dry-logic (~> 0.5, >= 0.5.0)
-      dry-types (~> 0.14.0)
+      dry-logic (~> 1.0, >= 1.0.2)

     dynamic_form (1.1.4)
     dynamic_form (1.1.4)

-    erb_lint (0.0.28)
+    erb_lint (0.0.29)

       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
       activesupport
       better_html (~> 1.0.7)
       html_tokenizer


@@ -162,10 +180,6 @@ 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)
     execjs (2.7.0)
     exifr (1.3.6)
     factory_bot (5.0.2)


@@ -177,35 +191,38 @@ GEM
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)

-    fspath (3.1.1)
-    gd2-ffij (0.3.0)
+    ffi-libarchive (0.4.10)
+      ffi (~> 1.0)
+    fspath (3.1.2)
+    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.4.0)
+    hashdiff (1.0.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.3)
+    i18n-js (3.3.0)

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

-    image_optim (0.26.4)
+    image_optim (0.26.5)

       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.2)
+    image_optim_rails (0.4.3)

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

-    image_size (2.0.1)
-    in_threads (1.5.2)
-    jaro_winkler (1.5.2)
-    jquery-rails (4.3.3)
+    image_size (2.0.2)
+    in_threads (1.5.3)
+    jaro_winkler (1.5.3)
+    jmespath (1.4.0)
+    jquery-rails (4.3.5)

       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)


@@ -218,7 +235,6 @@ GEM
     jwt (2.2.1)
     kgio (2.11.2)
     kramdown (2.1.0)
     jwt (2.2.1)
     kgio (2.11.2)
     kramdown (2.1.0)

-    libv8 (3.16.14.19)

     libxml-ruby (3.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
     libxml-ruby (3.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)


@@ -237,19 +253,17 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)

-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)

     mimemagic (0.3.3)
     mimemagic (0.3.3)

-    mini_mime (1.0.1)
+    mini_magick (4.9.5)
+    mini_mime (1.0.2)

     mini_portile2 (2.4.0)
     minitest (5.11.3)
     mini_portile2 (2.4.0)
     minitest (5.11.3)

-    msgpack (1.2.10)
+    msgpack (1.3.1)

     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)

-    nio4r (2.3.1)
-    nokogiri (1.10.3)
+    nio4r (2.4.0)
+    nokogiri (1.10.4)

       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)


@@ -273,10 +287,10 @@ 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.7.0)
+    omniauth-google-oauth2 (0.8.0)

       jwt (>= 2.0)
       omniauth (>= 1.1.1)
       jwt (>= 2.0)
       omniauth (>= 1.1.1)

-      omniauth-oauth2 (>= 1.5)
+      omniauth-oauth2 (>= 1.6)

     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)


@@ -293,12 +307,6 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)

-    paperclip (5.3.0)
-      activemodel (>= 4.2.0)
-      activesupport (>= 4.2.0)
-      mime-types
-      mimemagic (~> 0.3.0)
-      terrapin (~> 0.6.0)

     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)


@@ -307,9 +315,9 @@ GEM
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)

-    progress (3.5.1)
+    progress (3.5.2)

     psych (3.1.0)
     psych (3.1.0)

-    public_suffix (3.1.0)
+    public_suffix (3.1.1)

     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)


@@ -341,7 +349,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)

-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)

       loofah (~> 2.2, >= 2.2.2)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       loofah (~> 2.2, >= 2.2.2)
     rails-i18n (4.0.2)
       i18n (~> 0.6)


@@ -353,27 +361,29 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)

-    rake (12.3.2)
+    rake (12.3.3)

     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     record_tag_helper (1.0.0)
       actionview (~> 5.x)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     record_tag_helper (1.0.0)
       actionview (~> 5.x)

-    ref (2.0.0)

     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.6)
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.6)

-    rotp (5.0.0)
+    rotp (5.1.0)

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

-    rubocop (0.71.0)
+    rubocop (0.74.0)

       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)

-    rubocop-performance (1.3.0)
-      rubocop (>= 0.68.0)
+    rubocop-performance (1.4.1)
+      rubocop (>= 0.71.0)
+    rubocop-rails (2.3.1)
+      rack (>= 1.1)
+      rubocop (>= 0.72.0)

     ruby-openid (2.7.0)
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)


@@ -385,19 +395,19 @@ GEM
     sassc (2.0.1)
       ffi (~> 1.9)
       rake
     sassc (2.0.1)
       ffi (~> 1.9)
       rake

-    sassc-rails (2.1.1)
+    sassc-rails (2.1.2)

       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
       sprockets-rails
       tilt
       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
       sprockets-rails
       tilt

-    secure_headers (6.1.0)
+    secure_headers (6.1.1)

     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)

-    smart_properties (1.14.0)
+    smart_properties (1.15.0)

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


@@ -405,19 +415,14 @@ 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)
+    strong_migrations (0.4.1)

       activerecord (>= 5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
       activerecord (>= 5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)

-    terrapin (0.6.0)
-      climate_control (>= 0.0.3, < 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref

     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)

-    tins (1.20.3)
+    tins (1.21.1)

     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)


@@ -426,13 +431,13 @@ GEM
     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.6.0)
+    webmock (3.6.2)

       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)

       websocket-extensions (>= 0.1.0)
       websocket-extensions (>= 0.1.0)

-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)

     xpath (3.2.0)
       nokogiri (~> 1.8)
 
     xpath (3.2.0)
       nokogiri (~> 1.8)
 


@@ -447,11 +452,13 @@ DEPENDENCIES
   activerecord-import
   annotate
   autoprefixer-rails (~> 8.6.3)
   activerecord-import
   annotate
   autoprefixer-rails (~> 8.6.3)

+  aws-sdk-s3

   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.1.0)
   browser
   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.1.0)
   browser

+  bzip2-ffi

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


@@ -463,12 +470,11 @@ 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)
   geoip
   htmlentities
   http_accept_language (~> 2.0.0)


@@ -482,6 +488,8 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
   libxml-ruby (>= 2.0.5)
   listen
   logstasher

+  mimemagic
+  mini_magick

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


@@ -492,7 +500,6 @@ DEPENDENCIES
   omniauth-openid
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.0)
   omniauth-openid
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.0)

-  paperclip (~> 5.2)

   pg
   poltergeist
   psych
   pg
   poltergeist
   psych


@@ -509,11 +516,11 @@ DEPENDENCIES
   rotp
   rubocop
   rubocop-performance
   rotp
   rubocop
   rubocop-performance

+  rubocop-rails

   sanitize
   sassc-rails
   secure_headers
   strong_migrations
   sanitize
   sassc-rails
   secure_headers
   strong_migrations

-  therubyracer

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