From fbdbbb980f0a1fb8f415405aa86510cd46342c0c Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Sat, 20 May 2017 12:57:54 +1000
Subject: [PATCH] Rubocop: Disable Lint/AmbiguousBlockAssociation in main
 config

---
 .rubocop.yml      | 7 +++++++
 .rubocop_todo.yml | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 6512b37549..cd7a707f89 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -20,6 +20,13 @@ Style/Documentation:
 Style/StringLiterals:
   Enabled: false
 
+# Suggested settings
+# These are still to be decided upon, but recommended for inclusion by
+# oeoeaio after scrutinising offenses the codebase
+
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
 # Relaxed.Ruby.Style settings
 # These styles are a starting point for the conversation around conventions
 # They should be removed or moved above + tweaked as decisions are made
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 82a82a20d6..2dbf889ef4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -14,10 +14,6 @@ Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
 
-# Offense count: 113
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-
 # Offense count: 48
 Lint/AmbiguousOperator:
   Enabled: false