Localisation updates from https://translatewiki.net.

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 73928271e8776935f1abc5358f046e3cc27b5324..b2cc901b0959f1888f03e33b531ffce6d2d57210 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,6 +13,7 @@ Lint/AssignmentInCondition:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_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'
@@ -99,6 +100,11 @@ Naming/PredicateName:
     - '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