Commit 4404ea86 authored by Sean McGivern's avatar Sean McGivern
Browse files

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

Fix Rubocop configuration files to avoid CE to EE merge problems

See merge request !8525
......@@ -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
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment