Merge remote-tracking branch 'github/pull/355' into master

diff --git a/Gemfile.lock b/Gemfile.lock
index 99a20d25dea62801a32cbdee96b6553b2342dd8d..fa4087be0a15c71ac08c1d1ecbd29a7b32998fc4 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,8 +5,8 @@ GEM
     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)
     chef-utils (16.6.14)
-    cookstyle (6.21.1)
-      rubocop (= 0.93.1)
+    cookstyle (7.0.0)
+      rubocop (= 1.1.0)
     diff-lcs (1.4.4)
     docker-api (2.0.0)
       excon (>= 0.47.0)
@@ -73,16 +73,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.93.1)
+    rubocop (1.1.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
+    rubocop-ast (1.1.0)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)