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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 846b4961b16d8e43c08531439a2e3b8e5debcdbc..e4448fddc0dff354727881ff097262786f3c7ba3 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.3)
-    dalli (2.7.7)
+    dalli (2.7.6)
     docile (1.1.5)
     dynamic_form (1.1.4)
     erubi (1.7.1)
@@ -279,9 +279,9 @@ GEM
       rack (>= 1.4)
     rinku (2.0.4)
     rotp (3.3.1)
-    rubocop (0.52.1)
+    rubocop (0.54.0)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)