Merge branch 'fix/rubocop-configuration-files' into 'master'

Fix Rubocop configuration files to avoid CE to EE merge problems See merge request !8525

Merge branch 'fix/rubocop-configuration-files' into 'master'
Fix Rubocop configuration files to avoid CE to EE merge problems See merge request !8525
4404ea86 · Sean McGivern · cec7b8f9 · 8a75f68d · 4404ea86 · 4404ea86
Commit 4404ea86 authored Jan 11, 2017 by Sean McGivern
Expand all Show whitespace changes
Inline Side-by-side

Showing with 85 additions and 410 deletions

.rubocop.yml .rubocop.yml +0 -4

.rubocop_todo.yml .rubocop_todo.yml +85 -406

No files found.
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -343,10 +343,6 @@ Style/ParenthesesAroundCondition:
 Style/RedundantParentheses:
  Enabled: true

-# Don't use return where it's not required.
-Style/RedundantReturn:
-  Enabled: true
-
 # Don't use semicolons to terminate expressions.
 Style/Semicolon:
  Enabled: true

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml