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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index eb89e7df6c96ee94b53d8fbdead63cba42a03ee6..2f6eb84067d8abf20aa65123879e889b176d5c94 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,9 +54,9 @@ GEM
       rake (>= 10.4, < 13.0)
     arel (9.0.0)
     ast (2.4.0)
-    autoprefixer-rails (9.1.0)
+    autoprefixer-rails (8.6.5)
       execjs
-    better_errors (2.4.0)
+    better_errors (2.5.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -104,10 +104,10 @@ GEM
     erubi (1.7.1)
     execjs (2.7.0)
     exifr (1.3.4)
-    factory_bot (4.10.0)
+    factory_bot (4.11.0)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.10.0)
-      factory_bot (~> 4.10.0)
+    factory_bot_rails (4.11.0)
+      factory_bot (~> 4.11.0)
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
@@ -124,17 +124,17 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.0.11)
       i18n (>= 0.6.6, < 2)
-    image_optim (0.26.1)
+    image_optim (0.26.2)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
-      image_size (~> 1.5)
+      image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
     image_optim_rails (0.4.1)
       image_optim (~> 0.24)
       rails
       sprockets
-    image_size (1.5.0)
+    image_size (2.0.0)
     in_threads (1.5.0)
     jaro_winkler (1.5.1)
     jquery-rails (4.3.3)
@@ -156,7 +156,9 @@ GEM
     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
     listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     logstash-event (1.2.02)
     logstasher (1.2.2)
       activesupport (>= 4.0)
@@ -170,11 +172,12 @@ GEM
     marcel (0.3.2)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
-    mime-types (3.2.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mimemagic (0.3.2)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
     minitest (5.11.3)
     msgpack (1.2.4)
     multi_json (1.13.1)
@@ -182,6 +185,7 @@ GEM
     multipart-post (2.0.0)
     nio4r (2.3.1)
     nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
       nokogiri
     oauth (0.4.7)
@@ -241,7 +245,7 @@ GEM
     powerpack (0.1.2)
     progress (3.4.0)
     psych (3.0.2)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     puma (3.12.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
@@ -307,6 +311,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.0)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     sanitize (4.6.6)
       crass (~> 1.0.2)
@@ -377,7 +382,7 @@ DEPENDENCIES
   aasm
   actionpack-page_caching
   annotate
-  autoprefixer-rails
+  autoprefixer-rails (~> 8.6.3)
   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller