diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 7ec4e35f7..d950c2f57 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -106,11 +106,6 @@ Lint/OrAssignmentToConstant: Exclude: - 'lib/sanitize_ext/sanitize_config.rb' -# This cop supports safe autocorrection (--autocorrect). -Lint/SendWithMixinArgument: - Exclude: - - 'config/application.rb' - # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. Lint/UnusedBlockArgument: diff --git a/config/application.rb b/config/application.rb index 26f794203..6821d36b2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -196,10 +196,10 @@ module Mastodon config.to_prepare do Doorkeeper::AuthorizationsController.layout 'modal' Doorkeeper::AuthorizedApplicationsController.layout 'admin' - Doorkeeper::Application.send :include, ApplicationExtension - Doorkeeper::AccessToken.send :include, AccessTokenExtension - Devise::FailureApp.send :include, AbstractController::Callbacks - Devise::FailureApp.send :include, Localized + Doorkeeper::Application.include ApplicationExtension + Doorkeeper::AccessToken.include AccessTokenExtension + Devise::FailureApp.include AbstractController::Callbacks + Devise::FailureApp.include Localized end end end