Merge pull request #1562 from alphagov/dependabot/bundler/rubocop-gov…

…uk-2.0.0 Bump rubocop-govuk from 1.0.0 to 2.0.0
alphagov · Dec 5, 2019 · 119b0ab · 119b0ab
2 parents ca644e5 + e217e49
commit 119b0ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -22,7 +22,7 @@ gem "uglifier", ">= 1.3.0"
 group :development, :test do
   gem "govuk_schemas", "~> 4.0"
   gem "jasmine-rails"
-  gem "rubocop-govuk", "~> 1"
+  gem "rubocop-govuk", "~> 2"
   gem "scss_lint-govuk", "~> 0.2"
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     null_logger (0.0.1)
-    parallel (1.18.0)
+    parallel (1.19.1)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     phantomjs (2.1.1.0)
@@ -247,18 +247,18 @@ GEM
       netrc (~> 0.8)
     robotex (1.0.0)
     rouge (3.13.0)
-    rubocop (0.76.0)
+    rubocop (0.77.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-govuk (1.0.0)
-      rubocop (~> 0.76)
+    rubocop-govuk (2.0.0)
+      rubocop (= 0.77)
       rubocop-rails (~> 2)
       rubocop-rspec (~> 1.28)
-    rubocop-rails (2.3.2)
+    rubocop-rails (2.4.0)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     rubocop-rspec (1.37.0)
@@ -376,7 +376,7 @@ DEPENDENCIES
   rails-controller-testing (~> 1.0)
   rails-i18n (>= 4.0.4)
   rails_translation_manager (~> 0.1.0)
-  rubocop-govuk (~> 1)
+  rubocop-govuk (~> 2)
   sass-rails (~> 5.0)
   scss_lint-govuk (~> 0.2)
   slimmer (~> 13.2)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -10,8 +10,6 @@ def t_locale_fallback(key, options = {})
 
     if translation.nil? || translation.include?("translation missing")
       I18n.default_locale
-    else
-      return nil
     end
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,6 @@ def t_locale_fallback(key, options = {}) @@
         if translation.nil? || translation.include?("translation missing")
           I18n.default_locale
-        else
-          return nil
         end
       end
@@ Expand Down @@