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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 041b7ef5eccd725c76885705f214243e31f3dc2c..fa15ea90a0d5a1ba00019d93f94bc52a157a7fda 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -52,7 +52,6 @@ Lint/AssignmentInCondition:
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
     - 'app/mailers/user_mailer.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
     - 'app/mailers/user_mailer.rb'

-    - 'app/models/client_application.rb'

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


@@ -113,7 +112,6 @@ Rails/ActionControllerFlashBeforeRender:
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/confirmations_controller.rb'
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/confirmations_controller.rb'

-    - 'app/controllers/friendships_controller.rb'

     - 'app/controllers/issue_comments_controller.rb'
     - 'app/controllers/messages_controller.rb'
     - 'app/controllers/passwords_controller.rb'
     - 'app/controllers/issue_comments_controller.rb'
     - 'app/controllers/messages_controller.rb'
     - 'app/controllers/passwords_controller.rb'


@@ -143,7 +141,6 @@ Rails/InverseOf:
   Exclude:
     - 'app/models/changeset.rb'
     - 'app/models/diary_entry.rb'
   Exclude:
     - 'app/models/changeset.rb'
     - 'app/models/diary_entry.rb'

-    - 'app/models/friendship.rb'

     - 'app/models/issue.rb'
     - 'app/models/message.rb'
     - 'app/models/note.rb'
     - 'app/models/issue.rb'
     - 'app/models/message.rb'
     - 'app/models/note.rb'