From: Andy Allan <github@gravitystorm.co.uk>
Date: Wed, 3 Oct 2018 12:04:12 +0000 (+0200)
Subject: Merge branch 'master' into messages
X-Git-Tag: live~2857^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5e407dfb34f47e6fbbbf3c11c1a8318256abb5cd

Merge branch 'master' into messages
---

5e407dfb34f47e6fbbbf3c11c1a8318256abb5cd
diff --cc .rubocop_todo.yml
index 78ed84ac3,293135907..d3e51600d
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -51,10 -34,11 +34,11 @@@ Lint/HandleExceptions
  Metrics/AbcSize:
    Max: 280
  
- # Offense count: 41
+ # Offense count: 40
  # Configuration parameters: CountComments, ExcludedMethods.
+ # ExcludedMethods: refine
  Metrics/BlockLength:
 -  Max: 259
 +  Max: 262
  
  # Offense count: 11
  # Configuration parameters: CountBlocks.