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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 9e4c27a82f21b19867fcbba292a5708f463708ca..bf4c5940452fecba4f06a0f9f1f8c310537376f2 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,7 +390,7 @@ GEM
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.1.0)
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.1.0)

-    rubocop (0.89.1)
+    rubocop (0.90.0)

       parallel (~> 1.10)
       parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)