From: Tom Hughes <tom@compton.nu>
Date: Fri, 25 Jun 2021 11:43:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/427'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1905f4711db7d0496edf82f6fac7971a1dcbddf9?hp=92e1c6df66ac42fd6a3fdc70c75a6db617da0b84

Merge remote-tracking branch 'github/pull/427'
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 9c2665c1d..e2c31037d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,8 +7,8 @@ GEM
     chef-utils (17.2.29)
       concurrent-ruby
     concurrent-ruby (1.1.9)
-    cookstyle (7.13.0)
-      rubocop (= 1.15.0)
+    cookstyle (7.14.2)
+      rubocop (= 1.17.0)
     diff-lcs (1.4.4)
     docker-api (2.1.0)
       excon (>= 0.47.0)
@@ -75,16 +75,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.15.0)
+    rubocop (1.17.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.6.0)
+    rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     rubyntlm (0.6.3)