Update RuboCop to 1.8.1 (#32530).

git-svn-id: http://svn.redmine.org/redmine/trunk@20715 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 83ed56c8f6c03f1743fee5b05dd0794bdb585102..6d6d02f5b31e61419c3f8017a619ca12963ba2b8 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 20 --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.5.2.
+# using RuboCop version 1.8.1.
 # 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
@@ -260,6 +260,10 @@ Lint/AmbiguousRegexpLiteral:
 Lint/AssignmentInCondition:
   Enabled: false
 
+Lint/BinaryOperatorWithIdenticalOperands:
+  Exclude:
+    - 'lib/redmine/helpers/calendar.rb'
+
 # Cop supports --auto-correct.
 Lint/DeprecatedClassMethods:
   Exclude:
@@ -275,6 +279,7 @@ Lint/DeprecatedClassMethods:
     - 'test/unit/attachment_test.rb'
     - 'test/unit/issue_import_test.rb'
 
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
     - 'app/helpers/queries_helper.rb'
@@ -445,7 +450,7 @@ Naming/RescuedExceptionsVariableName:
     - 'lib/redmine/scm/adapters/abstract_adapter.rb'
     - 'lib/redmine/scm/adapters/filesystem_adapter.rb'
 
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, AllowedIdentifiers.
 # SupportedStyles: snake_case, camelCase
 Naming/VariableName:
   Exclude:
@@ -1492,6 +1497,7 @@ Style/Proc:
     - 'test/unit/lib/redmine/menu_manager/menu_helper_test.rb'
     - 'test/unit/lib/redmine/menu_manager/menu_item_test.rb'
 
+# Cop supports --auto-correct.
 # Configuration parameters: Methods.
 Style/RedundantArgument:
   Exclude:

diff --git a/Gemfile b/Gemfile
index 5eb62c1e9a1cef5a7aab7c2c0d30e7c4d22c807d..88c71c4a7e3e18761f5fdec09b140112fc30c909 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -92,7 +92,7 @@ group :test do
   gem 'capybara', '~> 3.31.0'
   gem "selenium-webdriver"
   # RuboCop
-  gem 'rubocop', '~> 1.5.2'
+  gem 'rubocop', '~> 1.8.1'
   gem 'rubocop-performance', '~> 1.9.0'
   gem 'rubocop-rails', '~> 2.9.0'
 end