Merge pull request #118 from gocardless/joesouthan-and-or

Enforce `always` style for `Style/AndOr`
gocardless · Dec 4, 2023 · d368faa · d368faa
2 parents db56d4a + fa873b2
commit d368faa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.1.2
+3.2.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+4.4.0
+-----
+* Enforce `always` style for [Style/AndOr](https://docs.rubocop.org/rubocop/cops_style.html#styleandor)
+
 4.3.0
 -----
 

diff --git a/gc_ruboconfig.gemspec b/gc_ruboconfig.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'gc_ruboconfig'
-  spec.version       = '4.3.0'
+  spec.version       = '4.4.0'
   spec.summary       = "GoCardless's shared Rubocop configuration, conforming to our house style"
   spec.authors       = %w[GoCardless]
   spec.homepage      = 'https://github.com/gocardless/ruboconfig'

diff --git a/rubocop.yml b/rubocop.yml
@@ -671,3 +671,7 @@ Capybara/SpecificActions: # new in 2.14
 # Seems to be buggy, causes an infinite loop for `subjects` named `create`
 FactoryBot/ConsistentParenthesesStyle: # new in 2.14
   Enabled: false
+
+Style/AndOr:
+  Enabled: true
+  EnforcedStyle: always