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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 6f7a0919bd303452e8d5b7f9072c8739ad8395a6..57feba1fd0c4623ab2f34d99ed4f3f4c5d2ea0e3 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,54 +2,56 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    aasm (5.0.1)
+    aasm (5.0.2)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (5.2.2.1)
+      actionpack (= 5.2.2.1)

       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)

-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailer (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      actionview (= 5.2.2.1)
+      activejob (= 5.2.2.1)

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

-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (5.2.2.1)
+      actionview (= 5.2.2.1)
+      activesupport (= 5.2.2.1)

       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.1.1)
       actionpack (>= 4.0.0, < 6)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.1.1)
       actionpack (>= 4.0.0, < 6)

-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.2.1)
+      activesupport (= 5.2.2.1)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_record_union (1.3.0)
       activerecord (>= 4.0)

-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (5.2.2.1)
+      activesupport (= 5.2.2.1)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.2.1)
+      activesupport (= 5.2.2.1)
+    activerecord (5.2.2.1)
+      activemodel (= 5.2.2.1)
+      activesupport (= 5.2.2.1)

       arel (>= 9.0)
       arel (>= 9.0)

-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activerecord-import (0.28.1)
+      activerecord (>= 3.2)
+    activestorage (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activerecord (= 5.2.2.1)

       marcel (~> 0.3.1)
       marcel (~> 0.3.1)

-    activesupport (5.2.2)
+    activesupport (5.2.2.1)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)

-    addressable (2.5.2)
+    addressable (2.6.0)

       public_suffix (>= 2.0.2, < 4.0)
     annotate (2.7.4)
       activerecord (>= 3.2, < 6.0)
       public_suffix (>= 2.0.2, < 4.0)
     annotate (2.7.4)
       activerecord (>= 3.2, < 6.0)


@@ -58,19 +60,20 @@ GEM
     ast (2.4.0)
     autoprefixer-rails (8.6.5)
       execjs
     ast (2.4.0)
     autoprefixer-rails (8.6.5)
       execjs

-    better_errors (2.5.0)
+    better_errors (2.5.1)

       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.3.2)
+    bootsnap (1.4.1)

       msgpack (~> 1.0)
       msgpack (~> 1.0)

+    browser (2.5.3)

     builder (3.2.3)
     cancancan (2.3.0)
     builder (3.2.3)
     cancancan (2.3.0)

-    canonical-rails (0.2.4)
-      rails (>= 4.1, < 5.3)
+    canonical-rails (0.2.5)
+      rails (>= 4.1, < 6.1)

     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)


@@ -90,7 +93,11 @@ GEM
     coffee-script-source (1.12.2)
     composite_primary_keys (11.1.0)
       activerecord (~> 5.2.1)
     coffee-script-source (1.12.2)
     composite_primary_keys (11.1.0)
       activerecord (~> 5.2.1)

-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
+    config (1.7.1)
+      activesupport (>= 3.0)
+      deep_merge (~> 1.2.1)
+      dry-validation (>= 0.12.2)

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


@@ -102,30 +109,59 @@ GEM
     crass (1.0.4)
     dalli (2.7.9)
     debug_inspector (0.0.3)
     crass (1.0.4)
     dalli (2.7.9)
     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 (>= 3.0, < 5)
     docile (1.3.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 (>= 3.0, < 5)
     docile (1.3.1)

+    dry-configurable (0.8.2)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+    dry-container (0.7.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.7)
+      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-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-types (0.14.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.2)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 0.5, >= 0.5)
+    dry-validation (0.13.0)
+      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.14)

     dynamic_form (1.1.4)
     erubi (1.8.0)
     execjs (2.7.0)
     dynamic_form (1.1.4)
     erubi (1.8.0)
     execjs (2.7.0)

-    exifr (1.3.5)
-    factory_bot (4.11.1)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.11.1)
-      factory_bot (~> 4.11.1)
-      railties (>= 3.0.0)
-    fakefs (0.18.1)
+    exifr (1.3.6)
+    factory_bot (5.0.2)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.0.1)
+      factory_bot (~> 5.0.0)
+      railties (>= 4.2.0)
+    fakefs (0.20.0)

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

-    ffi (1.9.25)
+    ffi (1.10.0)

     fspath (3.1.0)
     gd2-ffij (0.3.0)
       ffi (>= 1.0.0)
     geoip (1.6.4)
     fspath (3.1.0)
     gd2-ffij (0.3.0)
       ffi (>= 1.0.0)
     geoip (1.6.4)

-    globalid (0.4.1)
+    globalid (0.4.2)

       activesupport (>= 4.2.0)
     hashdiff (0.3.8)
     hashie (3.6.0)
       activesupport (>= 4.2.0)
     hashdiff (0.3.8)
     hashie (3.6.0)


@@ -133,8 +169,8 @@ GEM
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.2.0)
-      i18n (>= 0.8.0, < 2)
+    i18n-js (3.2.1)
+      i18n (>= 0.6.6)

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


@@ -156,7 +192,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 (2.1.0)
+    json (2.2.0)

     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)


@@ -164,6 +200,7 @@ GEM
       jsonify (< 0.4.0)
     jwt (2.1.0)
     kgio (2.11.2)
       jsonify (< 0.4.0)
     jwt (2.1.0)
     kgio (2.11.2)

+    kramdown (2.1.0)

     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
     listen (3.1.5)
     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
     listen (3.1.5)


@@ -190,12 +227,12 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)

-    msgpack (1.2.6)
+    msgpack (1.2.9)

     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.3.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.3.1)

-    nokogiri (1.10.0)
+    nokogiri (1.10.1)

       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)


@@ -219,7 +256,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.0)
+    omniauth-google-oauth2 (0.6.1)

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


@@ -245,8 +282,8 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)

-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.14.0)
+    parser (2.6.0.0)

       ast (~> 2.4.0)
     pg (0.21.0)
     poltergeist (1.18.1)
       ast (~> 2.4.0)
     pg (0.21.0)
     poltergeist (1.18.1)


@@ -268,18 +305,18 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)

-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (5.2.2.1)
+      actioncable (= 5.2.2.1)
+      actionmailer (= 5.2.2.1)
+      actionpack (= 5.2.2.1)
+      actionview (= 5.2.2.1)
+      activejob (= 5.2.2.1)
+      activemodel (= 5.2.2.1)
+      activerecord (= 5.2.2.1)
+      activestorage (= 5.2.2.1)
+      activesupport (= 5.2.2.1)

       bundler (>= 1.3.0)
       bundler (>= 1.3.0)

-      railties (= 5.2.2)
+      railties (= 5.2.2.1)

       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)


@@ -293,9 +330,9 @@ GEM
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)

-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    railties (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activesupport (= 5.2.2.1)

       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)


@@ -306,31 +343,31 @@ GEM
       ffi (~> 1.0)
     record_tag_helper (1.0.0)
       actionview (~> 5.x)
       ffi (~> 1.0)
     record_tag_helper (1.0.0)
       actionview (~> 5.x)

-    redcarpet (3.4.0)

     ref (2.0.0)
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.4)
     ref (2.0.0)
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.4)

-    rotp (4.0.2)
+    rotp (4.1.0)

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

-    rubocop (0.62.0)
+    rubocop (0.65.0)

       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)

+      psych (>= 3.1.0)

       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)

-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)

     sanitize (5.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
     sanitize (5.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)

-    sassc (2.0.0)
-      ffi (~> 1.9.6)
+    sassc (2.0.1)
+      ffi (~> 1.9)

       rake
     sassc-rails (2.1.0)
       railties (>= 4.0.0)
       rake
     sassc-rails (2.1.0)
       railties (>= 4.0.0)


@@ -338,7 +375,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
       sprockets (> 3.0)
       sprockets-rails
       tilt

-    secure_headers (6.0.0)
+    secure_headers (6.1.0)

     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)


@@ -351,7 +388,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.7.0)
+    term-ansicolor (1.7.1)

       tins (~> 1.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
       tins (~> 1.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)


@@ -388,17 +425,20 @@ DEPENDENCIES
   aasm
   actionpack-page_caching
   active_record_union
   aasm
   actionpack-page_caching
   active_record_union

+  activerecord-import

   annotate
   autoprefixer-rails (~> 8.6.3)
   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.1.0)
   annotate
   autoprefixer-rails (~> 8.6.3)
   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.1.0)

+  browser

   cancancan
   canonical-rails
   capybara (~> 2.13)
   coffee-rails (~> 4.2)
   composite_primary_keys (~> 11.1.0)
   cancancan
   canonical-rails
   capybara (~> 2.13)
   coffee-rails (~> 4.2)
   composite_primary_keys (~> 11.1.0)

+  config

   coveralls
   dalli
   delayed_job_active_record
   coveralls
   dalli
   delayed_job_active_record


@@ -417,6 +457,7 @@ DEPENDENCIES
   json
   jsonify-rails
   kgio
   json
   jsonify-rails
   kgio

+  kramdown

   libxml-ruby (>= 2.0.5)
   listen
   logstasher
   libxml-ruby (>= 2.0.5)
   listen
   logstasher


@@ -439,12 +480,11 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 5.2.2)
+  rails (= 5.2.2.1)

   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper
   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper

-  redcarpet
-  rinku (>= 1.2.2)
+  rinku (= 2.0.4)

   rotp
   rubocop
   sanitize
   rotp
   rubocop
   sanitize