From d26970d04c70f0c1518d76dd409d3680e895a9fb Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Sat, 24 Jun 2017 12:59:03 +1000 Subject: [PATCH] Rubocop: Move Style/ClassAndModuleChildren back to rubocop_todo.yml --- .rubocop.yml | 5 ----- .rubocop_todo.yml | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 28cee15a0f..8ddda9832c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -51,11 +51,6 @@ Rails/DynamicFindBy: Rails/SkipsModelValidations: Enabled: false -# This should be enfored, but doing so would require changing the entire -# file, so should probably do when outstanding PRS are at a minimum -Style/ClassAndModuleChildren: - Enabled: false - # Relaxed.Ruby.Style SETTINGS # These styles are a starting point for the conversation around conventions # They should be removed or tweaked and moved above as decisions are made diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0a9462032f..7182721abb 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -477,6 +477,12 @@ Style/CaseIndentation: - 'app/models/enterprise.rb' - 'app/models/product_importer.rb' +# Offense count: 86 +# Configuration parameters: EnforcedStyle, SupportedStyles. +# SupportedStyles: nested, compact +Style/ClassAndModuleChildren: + Enabled: false + # Offense count: 3 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles.