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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index da801d681ab11b8071dcf50a836d3b884cb36ccd..f012237b31aba8b6fff09b291fa9f98ce279c6b4 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,19 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-10-05 10:04:24 +0100 using RuboCop version 0.50.0.
+# on 2018-06-19 09:02:55 +0100 using RuboCop version 0.57.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/MultilineOperationIndentation:
-  Exclude:
-    - 'lib/bounding_box.rb'
-
 # Offense count: 34
 Lint/AmbiguousOperator:
   Exclude:
@@ -22,7 +14,7 @@ Lint/AmbiguousOperator:
     - 'test/lib/bounding_box_test.rb'
     - 'test/lib/country_test.rb'
 
-# Offense count: 124
+# Offense count: 96
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
@@ -50,26 +42,21 @@ Lint/HandleExceptions:
     - 'app/controllers/amf_controller.rb'
     - 'app/controllers/user_controller.rb'
 
-# Offense count: 3
-Lint/InterpolationCheck:
-  Exclude:
-    - 'test/controllers/node_controller_test.rb'
-
 # Offense count: 2
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'app/views/changeset/list.atom.builder'
 
-# Offense count: 666
+# Offense count: 690
 Metrics/AbcSize:
   Max: 280
 
 # Offense count: 41
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 257
+  Max: 261
 
-# Offense count: 12
+# Offense count: 11
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5
@@ -77,19 +64,13 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1797
+  Max: 1795
 
-# Offense count: 71
+# Offense count: 72
 Metrics/CyclomaticComplexity:
   Max: 20
 
-# Offense count: 3004
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 1073
-
-# Offense count: 675
+# Offense count: 688
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
@@ -97,7 +78,7 @@ Metrics/MethodLength:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 147
+  Max: 135
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
@@ -108,7 +89,7 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 23
 
-# Offense count: 5
+# Offense count: 6
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/application_controller.rb'
@@ -118,10 +99,11 @@ Naming/AccessorMethodName:
     - 'lib/potlatch.rb'
 
 # Offense count: 8
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
 # NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
     - 'spec/**/*'
@@ -132,6 +114,17 @@ Naming/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
+# Offense count: 6
+# Configuration parameters: Database, Include.
+# SupportedDatabases: mysql, postgresql
+# Include: db/migrate/*.rb
+Rails/BulkChangeTable:
+  Exclude:
+    - 'db/migrate/20111116184519_update_oauth.rb'
+    - 'db/migrate/20120208122334_merge_acl_address_and_mask.rb'
+    - 'db/migrate/20120208194454_add_domain_to_acl.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
+
 # Offense count: 2
 # Configuration parameters: Include.
 # Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
@@ -174,56 +167,35 @@ Rails/OutputSafety:
     - 'test/helpers/application_helper_test.rb'
 
 # Offense count: 86
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # Offense count: 1
+# Configuration parameters: AllowedChars.
 Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 
-# Offense count: 219
+# Offense count: 229
 Style/Documentation:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Exclude:
     - 'app/controllers/way_controller.rb'
 
-# Offense count: 60
-# Cop supports --auto-correct.
-Style/LineEndConcatenation:
-  Exclude:
-    - 'db/migrate/008_remove_segments.rb'
-    - 'db/migrate/020_populate_node_tags_and_remove.rb'
-    - 'db/migrate/023_add_changesets.rb'
-    - 'lib/bounding_box.rb'
-    - 'lib/diff_reader.rb'
-    - 'lib/osm.rb'
-    - 'test/controllers/changeset_controller_test.rb'
-    - 'test/controllers/node_controller_test.rb'
-    - 'test/controllers/relation_controller_test.rb'
-    - 'test/controllers/way_controller_test.rb'
-
-# Offense count: 75
+# Offense count: 70
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11
 
-# Offense count: 95
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Enabled: false
-
-# Offense count: 2
-Style/RescueStandardError:
-  Exclude:
-    - 'app/helpers/browse_helper.rb'
+# Offense count: 3064
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 1073