From afeba4bb98a5d71996f800fd62ddecb562123d7d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 14:21:45 +0000 Subject: [PATCH 1/2] Bump rubocop-govuk from 3.3.2 to 3.5.0 Bumps [rubocop-govuk](https://github.com/alphagov/rubocop-govuk) from 3.3.2 to 3.5.0. - [Release notes](https://github.com/alphagov/rubocop-govuk/releases) - [Changelog](https://github.com/alphagov/rubocop-govuk/blob/master/CHANGELOG.md) - [Commits](https://github.com/alphagov/rubocop-govuk/compare/v3.3.2...v3.5.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b06d513be..ee646f321 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,7 +182,7 @@ GEM mini_portile2 (~> 2.4.0) null_logger (0.0.1) parallel (1.19.1) - parser (2.7.0.5) + parser (2.7.1.1) ast (~> 2.4.0) phantomjs (2.1.1.0) plek (3.0.0) @@ -249,22 +249,25 @@ GEM rexml (3.2.4) robotex (1.0.0) rouge (3.18.0) - rubocop (0.80.1) + rubocop (0.82.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) rexml ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - rubocop-govuk (3.3.2) - rubocop (= 0.80.1) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-govuk (3.5.0) + rubocop (= 0.82.0) rubocop-rails (~> 2) + rubocop-rake (~> 0.5.1) rubocop-rspec (~> 1.28) - rubocop-rails (2.5.0) + rubocop-rails (2.5.2) activesupport rack (>= 1.1) rubocop (>= 0.72.0) + rubocop-rake (0.5.1) + rubocop rubocop-rspec (1.38.1) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) @@ -324,7 +327,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.6.1) + unicode-display_width (1.7.0) unicorn (5.5.4) kgio (~> 2.6) raindrops (~> 0.7) From fe41afab62ff8dd8a2c2d35976bc21d92413d97c Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Thu, 16 Apr 2020 17:00:06 +0100 Subject: [PATCH 2/2] Fix linting error about no 'desc' for task --- Rakefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rakefile b/Rakefile index 0e147c269..1d1cacc10 100644 --- a/Rakefile +++ b/Rakefile @@ -18,5 +18,7 @@ unless Rails.env.production? end task default: %i[spec rubocop scss_lint] + + desc "Lint Ruby and SCSS files" task lint: %i[rubocop scss_lint] end