diff --git a/.rubocop.yml b/.rubocop.yml index 055107138..7e3b4291b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -166,6 +166,11 @@ Style/BracesAroundHashParameters: Description: 'Enforce braces style around hash parameters.' Enabled: false +Rails/ApplicationRecord: + Exclude: + - 'app/models/application_model.rb' + - 'app/models/active_job_lock.rb' + Rails/BulkChangeTable: Description: 'Check whether alter queries are combinable.' Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 3b91c11da..f4be71eb8 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -48,14 +48,6 @@ Metrics/ModuleLength: Metrics/PerceivedComplexity: Max: 115 -# Offense count: 3 -# Cop supports --auto-correct. -Rails/ApplicationRecord: - Exclude: - - 'app/models/application_model.rb' - - 'app/models/notification.rb' - - 'app/models/token.rb' - # Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: Include. diff --git a/app/models/active_job_lock.rb b/app/models/active_job_lock.rb index 3737f0820..2a8f89a8a 100644 --- a/app/models/active_job_lock.rb +++ b/app/models/active_job_lock.rb @@ -1,4 +1,4 @@ -class ActiveJobLock < ApplicationModel +class ActiveJobLock < ActiveRecord::Base def of?(active_job) active_job.job_id == active_job_id