diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad28ccef09..137df4618f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@
 * [#215](https://github.com/rubocop-hq/rubocop-rails/issues/215): Fix a false positive for `Rails/UniqueValidationWithoutIndex` when using Expression Indexes. ([@koic][])
 * [#214](https://github.com/rubocop-hq/rubocop-rails/issues/214): Fix an error for `Rails/UniqueValidationWithoutIndex`when a table has no column definition. ([@koic][])
 
+### Changes
+
+* [#210](https://github.com/rubocop-hq/rubocop-rails/issues/210): Accept `redirecto_to(...) and return` and similar cases. ([@koic][])
+
 ## 2.5.0 (2020-03-24)
 
 ### New features
diff --git a/config/default.yml b/config/default.yml
index f6817e69b9..e7f2efb20f 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -535,3 +535,7 @@ Rails/Validation:
   VersionChanged: '0.41'
   Include:
     - app/models/**/*.rb
+
+# Accept `redirecto_to(...) and return` and similar cases.
+Style/AndOr:
+  EnforcedStyle: conditionals