reverting erroneous deletion in previous commit

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8d81a7c56f99cc52b57159cc272288ac5c2a9fdb..a7b456aec43f5031f88cfa8d28b508aaaeeb61f9 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-09-07 11:03:27 +0100 using RuboCop version 0.41.2.
+# on 2016-10-20 21:45:27 +0100 using RuboCop version 0.44.1.
 # 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
@@ -48,9 +48,14 @@ Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'app/views/changeset/list.atom.builder'
 
-# Offense count: 626
+# Offense count: 630
 Metrics/AbcSize:
-  Max: 277
+  Max: 271
+
+# Offense count: 35
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+  Max: 295
 
 # Offense count: 12
 Metrics/BlockNesting:
@@ -59,19 +64,19 @@ Metrics/BlockNesting:
 # Offense count: 62
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1650
+  Max: 1660
 
-# Offense count: 68
+# Offense count: 69
 Metrics/CyclomaticComplexity:
   Max: 20
 
-# Offense count: 2561
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# Offense count: 2826
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 962
 
-# Offense count: 604
+# Offense count: 612
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
@@ -79,14 +84,14 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 139
+  Max: 147
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 70
+# Offense count: 71
 Metrics/PerceivedComplexity:
   Max: 23
 
@@ -106,6 +111,17 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
+# Offense count: 5
+# Configuration parameters: Include.
+# Include: db/migrate/*.rb
+Rails/NotNullColumn:
+  Exclude:
+    - 'db/migrate/002_cleanup_osm_db.rb'
+    - 'db/migrate/020_populate_node_tags_and_remove.rb'
+    - 'db/migrate/021_move_to_innodb.rb'
+    - 'db/migrate/025_add_end_time_to_changesets.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
+
 # Offense count: 17
 Rails/OutputSafety:
   Exclude:
@@ -120,7 +136,7 @@ Rails/OutputSafety:
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
-# Offense count: 65
+# Offense count: 74
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
@@ -140,10 +156,17 @@ Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 
-# Offense count: 218
+# Offense count: 220
 Style/Documentation:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'app/controllers/way_controller.rb'
+
 # Offense count: 60
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
@@ -159,7 +182,7 @@ Style/LineEndConcatenation:
     - 'test/controllers/relation_controller_test.rb'
     - 'test/controllers/way_controller_test.rb'
 
-# Offense count: 69
+# Offense count: 71
 # Cop supports --auto-correct.
 Style/NumericLiterals:
   MinDigits: 11