summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Jankowski <matt@jankowski.online>2024-01-12 08:10:14 -0500
committerGitHub <noreply@github.com>2024-01-12 13:10:14 +0000
commit28fdf933626c99566b0881cb4cb741f595c83644 (patch)
tree7a51750b29dfdf394fe61cc396d471350d9a09a8
parenta90c134850dd173abd3c2fc9258d60bd5262bec2 (diff)
Disable `Rails/LexicallyScopedActionFilter` for inherited auth controllers (#28711)
-rw-r--r--.rubocop.yml6
-rw-r--r--.rubocop_todo.yml7
2 files changed, 6 insertions, 7 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index bedd8f78500..a06621d6603 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -103,6 +103,12 @@ Rails/Exit:
- 'config/boot.rb'
- 'lib/mastodon/cli/*.rb'
+# Reason: Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railslexicallyscopedactionfilter
+Rails/LexicallyScopedActionFilter:
+ Exclude:
+ - 'app/controllers/auth/*'
+
Rails/SkipsModelValidations:
Exclude:
- 'db/*migrate/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bf4a9a09fe7..602d99c9f00 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -64,13 +64,6 @@ Rails/HasAndBelongsToMany:
- 'app/models/status.rb'
- 'app/models/tag.rb'
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
-Rails/LexicallyScopedActionFilter:
- Exclude:
- - 'app/controllers/auth/passwords_controller.rb'
- - 'app/controllers/auth/registrations_controller.rb'
-
Rails/OutputSafety:
Exclude:
- 'config/initializers/simple_form.rb'