diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 116f80228..9e7a1f152 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2019-01-30 10:50:33 +0100 using RuboCop version 0.63.1. +# on 2019-06-03 16:27:52 +0200 using RuboCop version 0.67.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -84,7 +84,7 @@ Layout/IndentationConsistency: Layout/IndentationWidth: Enabled: false -# Offense count: 15 +# Offense count: 16 # Cop supports --auto-correct. Layout/LeadingCommentSpace: Exclude: @@ -216,6 +216,12 @@ Layout/TrailingWhitespace: - 'lib/tasks/install.rake' - 'spec/shared_behaviors/restful_routing_behavior.rb' +# Offense count: 3 +Lint/AmbiguousOperator: + Exclude: + - 'lib/tasks/import_reports.rake' + - 'spec/support/describe_reports.rb' + # Offense count: 7 # Cop supports --auto-correct. Lint/DeprecatedClassMethods: diff --git a/Gemfile b/Gemfile index 4219be03c..c127df3d8 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ group :development, :test do gem 'listen' gem 'simplecov' gem 'simplecov-console' - gem 'rubocop-rails' + gem 'rubocop', '~> 0.67.0' gem 'rubocop-rails_config' gem 'haml_lint', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index a7405fbda..99468dcd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,6 +139,7 @@ GEM parser (2.6.3.0) ast (~> 2.4.0) pg (1.1.4) + psych (3.1.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -206,16 +207,14 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.71.0) + rubocop (0.67.2) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.5, != 2.5.1.1) + psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.0.0) - rack (>= 2.0) - rubocop (>= 0.70.0) + unicode-display_width (>= 1.4.0, < 1.6) rubocop-rails_config (0.5.1) railties (>= 3.0) rubocop (~> 0.60) @@ -274,7 +273,7 @@ GEM thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.0) + unicode-display_width (1.5.0) web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) @@ -316,7 +315,7 @@ DEPENDENCIES rspec-collection_matchers rspec-html-matchers rspec-rails - rubocop-rails + rubocop (~> 0.67.0) rubocop-rails_config safe_yaml sass-rails