From: Tom Hughes <tom@compton.nu>
Date: Sat, 3 Nov 2018 11:58:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2038'
X-Git-Tag: live~2789
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/391fb933f59075e36e9cea5ea35f5a5efdfc257e?hp=-c

Merge remote-tracking branch 'upstream/pull/2038'
---

391fb933f59075e36e9cea5ea35f5a5efdfc257e
diff --combined .rubocop_todo.yml
index 26a50cb97,22890e7c7..7d2c583eb
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -19,7 -19,7 +19,7 @@@ Lint/AssignmentInCondition
      - 'app/helpers/application_helper.rb'
      - 'app/helpers/browse_helper.rb'
      - 'app/models/client_application.rb'
 -    - 'app/models/notifier.rb'
 +    - 'app/mailers/notifier.rb'
      - 'lib/nominatim.rb'
      - 'lib/osm.rb'
      - 'script/deliver-message'
@@@ -32,7 -32,7 +32,7 @@@ Lint/HandleExceptions
  
  # Offense count: 692
  Metrics/AbcSize:
-   Max: 280
+   Max: 283
  
  # Offense count: 40
  # Configuration parameters: CountComments, ExcludedMethods.
@@@ -48,7 -48,7 +48,7 @@@ Metrics/BlockNesting
  # Offense count: 63
  # Configuration parameters: CountComments.
  Metrics/ClassLength:
-   Max: 1795
+   Max: 1801
  
  # Offense count: 72
  Metrics/CyclomaticComplexity: