summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-09-23 15:11:20 +0000
committerazul <azul@riseup.net>2017-09-23 15:11:20 +0000
commitfac140a8ff76e98c275194845125d4c97f4ba07b (patch)
tree08ffafb2c70935892e975704911080b9da84e391 /.rubocop.yml
parent787287318c54b019a12ef79525c9f5b10d93724d (diff)
parent8ac6bb8492c9a3b9ec5d7b5bf2b35907a1f8c332 (diff)
Merge branch 'rubocop' into 'master'
Style fixes based on Rubocop See merge request leap/nickserver!19
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 652bfba..ac0f4d4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
Style/GuardClause:
Enabled: false
@@ -12,3 +10,6 @@ Lint/DeprecatedClassMethods:
# complains about our nested module end; end style
Lint/EndAlignment:
Enabled: false
+
+Style/ClassAndModuleChildren:
+ EnforcedStyle: compact