diff options
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | .rubocop_todo.yml | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 84361a324..bf266b350 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ inherit_from: .rubocop_todo.yml AllCops: - TargetRubyVersion: 2.4 + TargetRubyVersion: 2.5 TargetRailsVersion: 5.2 NewCops: enable diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index ed63d721a..1c9049450 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -530,6 +530,14 @@ Performance/FixedSize: - 'test/integration/attachments_test.rb' # Cop supports --auto-correct. +Performance/RedundantEqualityComparisonBlock: + Exclude: + - 'app/models/query.rb' + - 'app/models/setting.rb' + - 'lib/redmine/field_format.rb' + - 'test/integration/api_test/issues_test.rb' + +# Cop supports --auto-correct. Performance/RedundantMatch: Exclude: - 'app/models/issue_relation.rb' @@ -1544,7 +1552,16 @@ Style/RedundantAssignment: # Cop supports --auto-correct. Style/RedundantBegin: Exclude: + - 'app/controllers/issues_controller.rb' + - 'app/models/auth_source.rb' - 'app/models/member.rb' + - 'app/models/repository.rb' + - 'app/models/setting.rb' + - 'lib/redmine/codeset_util.rb' + - 'lib/redmine/plugin.rb' + - 'test/unit/issue_nested_set_concurrency_test.rb' + - 'test/unit/project_nested_set_concurrency_test.rb' + - 'test/unit/query_test.rb' # Cop supports --auto-correct. Style/RedundantCondition: |