Merge pull request #224 from koic/change_enforced_style_to_conditionals

[Fix #210] Change enforced style to conditionals for `Style/AndOr`
rubocop · Apr 25, 2020 · f5cbb50 · f5cbb50
2 parents 1879b04 + 83a32e1
commit f5cbb50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 * [#233](https://github.com/rubocop-hq/rubocop-rails/pull/233): **(BREAKING)** Drop support for Ruby 2.3. ([@koic][])
 * [#236](https://github.com/rubocop-hq/rubocop-rails/pull/236): **(BREAKING)** Drop support for Rails 4.1 or lower. ([@koic][])
+* [#210](https://github.com/rubocop-hq/rubocop-rails/issues/210): Accept `redirecto_to(...) and return` and similar cases. ([@koic][])
 
 ## 2.5.2 (2020-04-09)
 

diff --git a/config/default.yml b/config/default.yml
@@ -549,3 +549,7 @@ Rails/Validation:
   VersionChanged: '0.41'
   Include:
     - app/models/**/*.rb
+
+# Accept `redirecto_to(...) and return` and similar cases.
+Style/AndOr:
+  EnforcedStyle: conditionals