From f7e611dfd0fb87bc3d75996b276ddc3d9364ac8b Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Tue, 27 Sep 2022 09:11:10 +0000
Subject: [PATCH] Disable RuboCop Style/SoleNestedConditional (#36919).

git-svn-id: https://svn.redmine.org/redmine/trunk@21855 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .rubocop.yml      |  3 +++
 .rubocop_todo.yml | 24 ------------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b8b060aee..b166316da 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -213,6 +213,9 @@ Style/Semicolon:
 Style/SlicingWithRange:
   Enabled: false
 
+Style/SoleNestedConditional:
+  Enabled: false
+
 Style/TernaryParentheses:
   Enabled: false
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 805c63ffb..b04754a10 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1700,30 +1700,6 @@ Style/SelfAssignment:
 Style/SingleLineMethods:
   Enabled: false
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/journals_controller.rb'
-    - 'app/controllers/wiki_controller.rb'
-    - 'app/models/board.rb'
-    - 'app/models/changeset.rb'
-    - 'app/models/issue.rb'
-    - 'app/models/issue_import.rb'
-    - 'app/models/issue_relation.rb'
-    - 'app/models/mail_handler.rb'
-    - 'app/models/principal.rb'
-    - 'app/models/project.rb'
-    - 'app/models/query.rb'
-    - 'app/models/time_entry.rb'
-    - 'app/models/user_import.rb'
-    - 'app/models/version.rb'
-    - 'app/models/watcher.rb'
-    - 'app/models/wiki_annotate.rb'
-    - 'app/models/wiki_page.rb'
-    - 'app/validators/date_validator.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireEnglish.
 # SupportedStyles: use_perl_names, use_english_names, use_builtin_english_names