From: Tom Hughes Date: Wed, 19 Jan 2022 12:46:30 +0000 (+0000) Subject: Merge remote-tracking branch 'github/pull/475' X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/7cafedb958ca7140807a3ec01638723f98f522fc?hp=b1e1a323520b711f1b9226d8eefd1e106bf74c17 Merge remote-tracking branch 'github/pull/475' --- diff --git a/Gemfile.lock b/Gemfile.lock index f3f21f4a1..f3f88a596 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,8 +7,8 @@ GEM chef-utils (17.8.25) concurrent-ruby concurrent-ruby (1.1.9) - cookstyle (7.30.1) - rubocop (= 1.24.1) + cookstyle (7.30.3) + rubocop (= 1.25.0) diff-lcs (1.4.4) docker-api (2.2.0) excon (>= 0.47.0) @@ -75,9 +75,9 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) - rubocop (1.24.1) + rubocop (1.25.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml