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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 1105724df6e75ca5914cf20b9fa17bcdbbd3d73e..59cfa88042fa13bfff6677e82171d0569cb111fb 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,7 +100,6 @@ GEM
       html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (1.1.0)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.5.1)
@@ -325,7 +324,6 @@ GEM
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.5.2)
-    psych (3.3.0)
     public_suffix (4.0.6)
     puma (5.1.1)
       nio4r (~> 2.0)
@@ -385,15 +383,15 @@ GEM
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)
-    rubocop (0.93.1)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.2)
@@ -449,7 +447,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
@@ -476,7 +474,6 @@ DEPENDENCIES
   autoprefixer-rails
   aws-sdk-s3
   better_errors
-  bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.4.2)
   bootstrap (~> 4.5.0)
@@ -524,7 +521,6 @@ DEPENDENCIES
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
-  psych
   puma (~> 5.0)
   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
@@ -535,7 +531,7 @@ DEPENDENCIES
   rails-i18n (~> 6.0.0)
   rinku (>= 2.0.6)
   rotp
-  rubocop (~> 0.93)
+  rubocop
   rubocop-minitest
   rubocop-performance
   rubocop-rails