diff --git a/.rubocop.yml b/.rubocop.yml index ceade6e5820..46cf0275f8d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -171,10 +171,11 @@ Rails/FilePath: Rails/HttpStatus: EnforcedStyle: numeric -# Reason: Allowed only in the `tootctl` CLI application code +# Reason: Allowed in `tootctl` CLI code and in boot ENV checker # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsexit Rails/Exit: Exclude: + - 'config/boot.rb' - 'lib/mastodon/*_cli.rb' - 'lib/mastodon/cli_helper.rb' - 'lib/cli.rb' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index de6857e071f..22412a053d0 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -712,12 +712,6 @@ Rails/DuplicateAssociation: - 'app/serializers/activitypub/collection_serializer.rb' - 'app/serializers/activitypub/note_serializer.rb' -# Configuration parameters: Include. -# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb -Rails/Exit: - Exclude: - - 'config/boot.rb' - # Configuration parameters: Include. # Include: app/models/**/*.rb Rails/HasAndBelongsToMany: