Merge branch 'rs-update-rubocop' into 'master'

Bump rubocop to 0.42.0 Also updates `.rubocop_todo.yml` for the latest cops. See merge request !6354

Merge branch 'rs-update-rubocop' into 'master'
08b48b7d · Rémy Coutable · 0a8b6630 · 287293be · 08b48b7d · 08b48b7d
Commit 08b48b7d authored Sep 15, 2016 by Rémy Coutable
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 76 additions and 57 deletions

.rubocop_todo.yml .rubocop_todo.yml +72 -53

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +3 -3

No files found.
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
--- a/Gemfile
+++ b/Gemfile
@@ -295,7 +295,7 @@ group :development, :test do
  gem 'spring-commands-spinach',  '~> 1.1.0'
  gem 'spring-commands-teaspoon', '~> 0.0.2'

-  gem 'rubocop', '~> 0.41.2', require: false
+  gem 'rubocop', '~> 0.42.0', require: false
  gem 'rubocop-rspec', '~> 1.5.0', require: false
  gem 'scss_lint', '~> 0.47.0', require: false
  gem 'haml_lint', '~> 0.18.2', require: false

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -619,7 +619,7 @@ GEM
    rspec-retry (0.4.5)
      rspec-core
    rspec-support (3.5.0)
-    rubocop (0.41.2)
+    rubocop (0.42.0)
      parser (>= 2.3.1.1, < 3.0)
      powerpack (~> 0.1)
      rainbow (>= 1.99.1, < 3.0)
@@ -762,7 +762,7 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.7.2)
-    unicode-display_width (1.1.0)
+    unicode-display_width (1.1.1)
    unicorn (4.9.0)
      kgio (~> 2.6)
      rack
@@ -944,7 +944,7 @@ DEPENDENCIES
  rqrcode-rails3 (~> 0.1.7)
  rspec-rails (~> 3.5.0)
  rspec-retry (~> 0.4.5)
-  rubocop (~> 0.41.2)
+  rubocop (~> 0.42.0)
  rubocop-rspec (~> 1.5.0)
  ruby-fogbugz (~> 0.2.1)
  ruby-prof (~> 0.15.9)