From f0cda8fd7a8205860c68dfec794808a15731cb5a Mon Sep 17 00:00:00 2001
From: Tejas Bubane <tejasbubane@gmail.com>
Date: Thu, 1 Dec 2016 00:35:33 +0530
Subject: [PATCH] [Fixes #3725] Disable `Style/SingleLineBlockParams` by
 default

---
 CHANGELOG.md        | 6 +++++-
 config/disabled.yml | 4 ++++
 config/enabled.yml  | 4 ----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d74641a32a12..6774f19fe4f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,14 @@
 # Change log
 
+## master (unreleased)
+
 ### New features
 
 * [#3757](https://github.com/bbatsov/rubocop/pull/3757): Add Auto-Correct for `Bundler/OrderedGems` cop. ([@pocke][])
 
-## master (unreleased)
+### Changes
+
+* [#3725](https://github.com/bbatsov/rubocop/issues/3725): Disable `Style/SingleLineBlockParams` by default. ([@tejasbubane][])
 
 ### Bug fixes
 
diff --git a/config/disabled.yml b/config/disabled.yml
index 1eb9e44af999..87aa8d22e823 100644
--- a/config/disabled.yml
+++ b/config/disabled.yml
@@ -113,3 +113,7 @@ Style/SymbolArray:
   Description: 'Use %i or %I for arrays of symbols.'
   StyleGuide: '#percent-i'
   Enabled: false
+
+Style/SingleLineBlockParams:
+  Description: 'Enforces the names of some block params.'
+  Enabled: true
diff --git a/config/enabled.yml b/config/enabled.yml
index 31e04348b035..c3cd9e85b2db 100644
--- a/config/enabled.yml
+++ b/config/enabled.yml
@@ -710,10 +710,6 @@ Style/SignalException:
   StyleGuide: '#prefer-raise-over-fail'
   Enabled: true
 
-Style/SingleLineBlockParams:
-  Description: 'Enforces the names of some block params.'
-  Enabled: true
-
 Style/SingleLineMethods:
   Description: 'Avoid single-line methods.'
   StyleGuide: '#no-single-line-methods'