diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8ade427..d64948a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -207,13 +207,6 @@ Style/PercentLiteralDelimiters: - 'app/controllers/problems_searcher.rb' - 'spec/models/notice_spec.rb' -# Offense count: 3 -# Cop supports --auto-correct. -Style/Proc: - Exclude: - - 'app/models/notice.rb' - - 'app/models/problem.rb' - # Offense count: 1 # Configuration parameters: Methods. Style/SingleLineBlockParams: diff --git a/app/models/notice.rb b/app/models/notice.rb index ce4ff2c..9a74cfb 100644 --- a/app/models/notice.rb +++ b/app/models/notice.rb @@ -28,7 +28,7 @@ class Notice scope :ordered, -> { order_by(:created_at.asc) } scope :reverse_ordered, -> { order_by(:created_at.desc) } - scope :for_errs, Proc.new { |errs| + scope :for_errs, -> (errs) { where(:err_id.in => errs.all.map(&:id)) } diff --git a/app/models/problem.rb b/app/models/problem.rb index cb212cd..998b711 100644 --- a/app/models/problem.rb +++ b/app/models/problem.rb @@ -12,8 +12,8 @@ class Problem user_agents: :user_agent_string }.freeze - field :last_notice_at, :type => ActiveSupport::TimeWithZone, :default => Proc.new { Time.zone.now } - field :first_notice_at, :type => ActiveSupport::TimeWithZone, :default => Proc.new { Time.zone.now } + field :last_notice_at, :type => ActiveSupport::TimeWithZone, :default => proc { Time.zone.now } + field :first_notice_at, :type => ActiveSupport::TimeWithZone, :default => proc { Time.zone.now } field :last_deploy_at, :type => Time field :resolved, :type => Boolean, :default => false field :resolved_at, :type => Time -- libgit2 0.21.2