Unpin rubocop now erb_lint is fixed

diff --git a/Gemfile b/Gemfile
index a880a85344220c7ae08d30d4c3c2b7de90ce8b3d..94820abebf22c7f6a51855fc29599c3a930936d1 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -144,7 +144,7 @@ group :test do
   gem "minitest", "~> 5.1"
   gem "puma", "~> 5.0"
   gem "rails-controller-testing"
   gem "minitest", "~> 5.1"
   gem "puma", "~> 5.0"
   gem "rails-controller-testing"

-  gem "rubocop", "~> 0.93"
+  gem "rubocop"

   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"

diff --git a/Gemfile.lock b/Gemfile.lock
index 1105724df6e75ca5914cf20b9fa17bcdbbd3d73e..5c9877809394cc0aa958075c594ccf34b2518e8a 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -385,15 +385,15 @@ GEM
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)

-    rubocop (0.93.1)
+    rubocop (1.8.1)

       parallel (~> 1.10)
       parallel (~> 1.10)

-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)

       rainbow (>= 2.2.2, < 4.0)
       rainbow (>= 2.2.2, < 4.0)

-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)

       rexml
       rexml

-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.2.0, < 2.0)

       ruby-progressbar (~> 1.7)
       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)
     rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.2)


@@ -449,7 +449,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
       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)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)


@@ -535,7 +535,7 @@ DEPENDENCIES
   rails-i18n (~> 6.0.0)
   rinku (>= 2.0.6)
   rotp
   rails-i18n (~> 6.0.0)
   rinku (>= 2.0.6)
   rotp

-  rubocop (~> 0.93)
+  rubocop

   rubocop-minitest
   rubocop-performance
   rubocop-rails
   rubocop-minitest
   rubocop-performance
   rubocop-rails