Allow moderators to hide diary entries and comments

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3ebd4d35f686bb0f4252f2689524b342ea3406ba..b2cc901b0959f1888f03e33b531ffce6d2d57210 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,31 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # 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-09-19 14:24:02 +0100 using RuboCop version 0.58.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.
 
 # 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:
-    - 'test/controllers/amf_controller_test.rb'
-    - 'test/controllers/changeset_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-    - 'test/lib/country_test.rb'
-
-# Offense count: 124
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-

 # Offense count: 32
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
 # Offense count: 32
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:


@@ -33,13 +13,15 @@ Lint/AssignmentInCondition:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'

-    - 'app/controllers/trace_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_preference_controller.rb'
+    - 'app/controllers/api/traces_controller.rb'
+    - 'app/controllers/traces_controller.rb'
+    - 'app/controllers/users_controller.rb'
+    - 'app/controllers/api/user_preferences_controller.rb'

     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'

+    - 'app/helpers/browse_tags_helper.rb'

     - 'app/models/client_application.rb'
     - 'app/models/client_application.rb'

-    - 'app/models/notifier.rb'
+    - 'app/mailers/notifier.rb'

     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'


@@ -47,29 +29,20 @@ Lint/AssignmentInCondition:
 # Offense count: 4
 Lint/HandleExceptions:
   Exclude:
 # Offense count: 4
 Lint/HandleExceptions:
   Exclude:

-    - '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'
+    - 'app/controllers/api/amf_controller.rb'
+    - 'app/controllers/users_controller.rb'

 
 

-# Offense count: 666
+# Offense count: 692

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 280
+  Max: 283

 
 

-# Offense count: 41
+# Offense count: 40

 # Configuration parameters: CountComments, ExcludedMethods.
 # Configuration parameters: CountComments, ExcludedMethods.

+# ExcludedMethods: refine

 Metrics/BlockLength:
 Metrics/BlockLength:

-  Max: 240
+  Max: 262

 
 

-# Offense count: 12
+# Offense count: 11

 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5


@@ -77,19 +50,13 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:

-  Max: 1796
+  Max: 1627

 
 

-# Offense count: 71
+# Offense count: 72

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 20
-
-# Offense count: 3004
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 1073
+  Max: 23

 
 

-# Offense count: 675
+# Offense count: 691

 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179


@@ -97,18 +64,18 @@ Metrics/MethodLength:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:

-  Max: 147
+  Max: 135

 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 

-# Offense count: 71
+# Offense count: 72

 Metrics/PerceivedComplexity:
   Max: 23
 
 Metrics/PerceivedComplexity:
   Max: 23
 

-# Offense count: 5
+# Offense count: 6

 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/application_controller.rb'
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/application_controller.rb'


@@ -118,10 +85,11 @@ Naming/AccessorMethodName:
     - 'lib/potlatch.rb'
 
 # Offense count: 8
     - '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?
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
 # NameWhitelist: is_a?

+# MethodDefinitionMacros: define_method, define_singleton_method

 Naming/PredicateName:
   Exclude:
     - 'spec/**/*'
 Naming/PredicateName:
   Exclude:
     - 'spec/**/*'


@@ -132,6 +100,22 @@ Naming/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 

+# Disabled pending merge of fix for:
+# https://github.com/rubocop-hq/rubocop/issues/6943
+Rails/ActiveRecordOverride:
+  Enabled: false
+
+# 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
 # Offense count: 2
 # Configuration parameters: Include.
 # Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb


@@ -162,9 +146,9 @@ Rails/NotNullColumn:
 # Offense count: 20
 Rails/OutputSafety:
   Exclude:
 # Offense count: 20
 Rails/OutputSafety:
   Exclude:

-    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/users_controller.rb'

     - 'app/helpers/application_helper.rb'
     - 'app/helpers/application_helper.rb'

-    - 'app/helpers/changeset_helper.rb'
+    - 'app/helpers/changesets_helper.rb'

     - 'app/helpers/geocoder_helper.rb'
     - 'app/helpers/note_helper.rb'
     - 'app/helpers/open_graph_helper.rb'
     - 'app/helpers/geocoder_helper.rb'
     - 'app/helpers/note_helper.rb'
     - 'app/helpers/open_graph_helper.rb'


@@ -174,56 +158,42 @@ Rails/OutputSafety:
     - 'test/helpers/application_helper_test.rb'
 
 # Offense count: 86
     - '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
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # Offense count: 1

+# Configuration parameters: AllowedChars.

 Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 
 Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 

-# Offense count: 219
+# Offense count: 230

 Style/Documentation:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 

-# Offense count: 1
+# Offense count: 462

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/way_controller.rb'
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false

 
 

-# Offense count: 60
+# Offense count: 2

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-Style/LineEndConcatenation:
+Style/IfUnlessModifier:

   Exclude:
   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'
+    - 'app/controllers/api/ways_controller.rb'

 
 

-# Offense count: 75
+# Offense count: 70

 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11
 
 # 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: 3080
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 1073