From f40716f48a25809d197ba2abf32ce150b7b73efa Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 21 Feb 2017 16:31:14 -0600
Subject: No more and/or

---
 .rubocop.yml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index b093d4d25d4..a836b469cc7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -54,6 +54,11 @@ Style/AlignArray:
 Style/AlignHash:
   Enabled: true
 
+# Whether `and` and `or` are banned only in conditionals (conditionals)
+# or completely (always).
+Style/AndOr:
+  Enabled: true
+
 # Use `Array#join` instead of `Array#*`.
 Style/ArrayJoin:
   Enabled: true
-- 
cgit v1.2.3