From 6aa71a086cb0be832f51be0bf8e4a982ae34f631 Mon Sep 17 00:00:00 2001
From: MAEDA Go <maeda@farend.jp>
Date: Mon, 29 Mar 2021 12:47:46 +0900
Subject: [PATCH 2/2] Update TargetRubyVersion of RuboCop to 2.5

---
 .rubocop.yml      |  2 +-
 .rubocop_todo.yml | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 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 8eb33fc26..1c9049450 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -529,6 +529,14 @@ Performance/FixedSize:
     - 'test/integration/api_test/issues_test.rb'
     - '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:
@@ -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:
@@ -1706,7 +1723,6 @@ Style/SoleNestedConditional:
     - 'app/models/project.rb'
     - 'app/models/query.rb'
     - 'app/models/time_entry.rb'
-    - 'app/models/token.rb'
     - 'app/models/user_import.rb'
     - 'app/models/version.rb'
     - 'app/models/watcher.rb'
-- 
2.29.2