Merge branch 'next-minor' into develop

This commit is contained in:
Benjamin Neff 2017-06-30 02:13:40 +02:00
commit cb50681cea
No known key found for this signature in database
GPG key ID: 971464C3F1A90194

View file

@ -164,16 +164,6 @@ Lint/Debugger:
Style/NumericPredicate: Style/NumericPredicate:
EnforcedStyle: comparison EnforcedStyle: comparison
# Old defaults from rubocop < 0.48.1
Style/PercentLiteralDelimiters:
PreferredDelimiters:
default: '()'
'%i': '()'
'%I': '()'
'%r': '{}'
'%w': '()'
'%W': '()'
# Reset some HoundCI changes back to Rubocop defaults # Reset some HoundCI changes back to Rubocop defaults
Style/DotPosition: Style/DotPosition:
EnforcedStyle: leading EnforcedStyle: leading