diff --git a/.rubocop.yml b/.rubocop.yml index c99d3d0b6ab5ca8ee3ad7a95ca730460bc839048..3bdccd69dbbfa26fca49e236ee6bb87c39dad6ce 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -243,6 +243,11 @@ Rails/ApplicationRecord: - ee/db/**/*.rb - ee/spec/**/*.rb +Rails/ActiveRecordCallbacksOrder: + Include: + - app/models/**/*.rb + - ee/app/models/**/*.rb + Cop/DefaultScope: Enabled: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 64ee60d7eb82a394bef31613e397313c55c47ee3..9fb8cd1dc504336f72c23d767e0275cf6bddd6a1 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -22,13 +22,6 @@ RSpec/PredicateMatcher: RSpec/RepeatedExampleGroupBody: Enabled: false -# Offense count: 26 -# Cop supports --auto-correct. -# Configuration parameters: Include. -# Include: app/models/**/*.rb -Rails/ActiveRecordCallbacksOrder: - Enabled: false - # Offense count: 313 # Configuration parameters: Include. # Include: db/migrate/*.rb diff --git a/.rubocop_todo/rails/active_record_callbacks_order.yml b/.rubocop_todo/rails/active_record_callbacks_order.yml new file mode 100644 index 0000000000000000000000000000000000000000..9585a720c6ac1896d991d94bb88b4202ec19ccdc --- /dev/null +++ b/.rubocop_todo/rails/active_record_callbacks_order.yml @@ -0,0 +1,28 @@ +--- +# Cop supports --auto-correct. +Rails/ActiveRecordCallbacksOrder: + # Offense count: 30 + # Temporarily disabled due to too many offenses + Enabled: false + Exclude: + - 'app/models/award_emoji.rb' + - 'app/models/ci/job_artifact.rb' + - 'app/models/gpg_key.rb' + - 'app/models/group.rb' + - 'app/models/issue.rb' + - 'app/models/key.rb' + - 'app/models/merge_request.rb' + - 'app/models/namespace.rb' + - 'app/models/namespace_statistics.rb' + - 'app/models/note.rb' + - 'app/models/pages_domain.rb' + - 'app/models/personal_access_token.rb' + - 'app/models/project.rb' + - 'app/models/prometheus_alert.rb' + - 'app/models/remote_mirror.rb' + - 'app/models/resource_label_event.rb' + - 'app/models/snippet_statistics.rb' + - 'app/models/upload.rb' + - 'app/models/user.rb' + - 'ee/app/models/dast_site_profile.rb' + - 'ee/app/models/geo_node.rb'