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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 2f6eb84067d8abf20aa65123879e889b176d5c94..08514dcda144e8dad00e92199ddced42f62b2992 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.0)
+    aasm (5.0.1)

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


@@ -21,7 +21,7 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)

-    actionpack-page_caching (1.1.0)
+    actionpack-page_caching (1.1.1)

       actionpack (>= 4.0.0, < 6)
     actionview (5.2.0)
       activesupport (= 5.2.0)
       actionpack (>= 4.0.0, < 6)
     actionview (5.2.0)
       activesupport (= 5.2.0)


@@ -63,7 +63,7 @@ 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.3.1)
+    bootsnap (1.3.2)

       msgpack (~> 1.0)
     builder (3.2.3)
     canonical-rails (0.2.4)
       msgpack (~> 1.0)
     builder (3.2.3)
     canonical-rails (0.2.4)


@@ -87,7 +87,7 @@ GEM
     coffee-script-source (1.12.2)
     composite_primary_keys (11.0.3)
       activerecord (~> 5.2.0)
     coffee-script-source (1.12.2)
     composite_primary_keys (11.0.3)
       activerecord (~> 5.2.0)

-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.0)

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


@@ -97,19 +97,24 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)

-    dalli (2.7.8)
+    dalli (2.7.9)

     debug_inspector (0.0.3)
     debug_inspector (0.0.3)

+    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)
     dynamic_form (1.1.4)
     erubi (1.7.1)
     execjs (2.7.0)
     exifr (1.3.4)
     docile (1.3.1)
     dynamic_form (1.1.4)
     erubi (1.7.1)
     execjs (2.7.0)
     exifr (1.3.4)

-    factory_bot (4.11.0)
+    factory_bot (4.11.1)

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

-    factory_bot_rails (4.11.0)
-      factory_bot (~> 4.11.0)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)

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

-    faraday (0.12.2)
+    faraday (0.15.3)

       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     fspath (3.1.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     fspath (3.1.0)


@@ -124,7 +129,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.0.11)
       i18n (>= 0.6.6, < 2)
       concurrent-ruby (~> 1.0)
     i18n-js (3.0.11)
       i18n (>= 0.6.6, < 2)

-    image_optim (0.26.2)
+    image_optim (0.26.3)

       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)


@@ -160,16 +165,16 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     logstash-event (1.2.02)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     logstash-event (1.2.02)

-    logstasher (1.2.2)
+    logstasher (1.3.0)

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

-    loofah (2.2.2)
+    loofah (2.2.3)

       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

-    mail (2.7.0)
+    mail (2.7.1)

       mini_mime (>= 0.1.1)
       mini_mime (>= 0.1.1)

-    marcel (0.3.2)
+    marcel (0.3.3)

       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mime-types (3.2.2)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mime-types (3.2.2)


@@ -184,19 +189,19 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.3.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.3.1)

-    nokogiri (1.8.4)
+    nokogiri (1.8.5)

       mini_portile2 (~> 2.3.0)
       mini_portile2 (~> 2.3.0)

-    nokogumbo (1.5.0)
-      nokogiri
+    nokogumbo (2.0.0)
+      nokogiri (~> 1.8, >= 1.8.4)

     oauth (0.4.7)
     oauth-plugin (0.5.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)

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


@@ -235,7 +240,7 @@ GEM
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     parallel (1.12.1)
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     parallel (1.12.1)

-    parser (2.5.1.2)
+    parser (2.5.3.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)


@@ -243,8 +248,8 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.2)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.2)

-    progress (3.4.0)
-    psych (3.0.2)
+    progress (3.5.0)
+    psych (3.0.3)

     public_suffix (3.0.3)
     puma (3.12.0)
     quad_tile (1.0.1)
     public_suffix (3.0.3)
     puma (3.12.0)
     quad_tile (1.0.1)


@@ -301,23 +306,23 @@ GEM
       rack (>= 1.4)
     rinku (2.0.4)
     rotp (3.3.1)
       rack (>= 1.4)
     rinku (2.0.4)
     rotp (3.3.1)

-    rubocop (0.58.2)
+    rubocop (0.60.0)

       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)

-      unicode-display_width (~> 1.0, >= 1.0.1)
+      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)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)

-    sanitize (4.6.6)
+    sanitize (5.0.0)

       crass (~> 1.0.2)
       crass (~> 1.0.2)

-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
-    sass (3.5.7)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
+    sass (3.6.0)

       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)


@@ -355,15 +360,15 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)

-    tins (1.16.3)
+    tins (1.17.0)

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

-    uglifier (4.1.18)
+    uglifier (4.1.19)

       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
     validates_email_format_of (1.6.3)
       i18n
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
     validates_email_format_of (1.6.3)
       i18n

-    vendorer (0.1.16)
+    vendorer (0.2.0)

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


@@ -371,7 +376,7 @@ GEM
     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)

-    xpath (3.1.0)
+    xpath (3.2.0)

       nokogiri (~> 1.8)
 
 PLATFORMS
       nokogiri (~> 1.8)
 
 PLATFORMS


@@ -393,6 +398,7 @@ DEPENDENCIES
   composite_primary_keys (~> 11.0.0)
   coveralls
   dalli
   composite_primary_keys (~> 11.0.0)
   coveralls
   dalli

+  delayed_job_active_record

   dynamic_form
   factory_bot_rails
   faraday
   dynamic_form
   factory_bot_rails
   faraday


@@ -437,7 +443,7 @@ DEPENDENCIES
   rotp
   rubocop
   sanitize
   rotp
   rubocop
   sanitize

-  sassc-rails
+  sassc-rails (~> 1.3)

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