diff --git a/Gemfile.lock b/Gemfile.lock index 8465bdc36..80d808df1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -314,7 +314,7 @@ GEM nio4r (~> 2.0) pundit (2.3.2) activesupport (>= 3.0.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-session (1.0.2) rack (< 3) @@ -373,7 +373,7 @@ GEM redcarpet (3.6.0) redis-client (0.22.1) connection_pool - regexp_parser (2.9.1) + regexp_parser (2.9.2) reline (0.5.5) io-console (~> 0.5) rexml (3.2.8) @@ -432,7 +432,7 @@ GEM rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.24.1) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) diff --git a/app/furniture/journal/entry_policy.rb b/app/furniture/journal/entry_policy.rb index ebbb6bbe1..61307831f 100644 --- a/app/furniture/journal/entry_policy.rb +++ b/app/furniture/journal/entry_policy.rb @@ -22,7 +22,7 @@ def permitted_attributes(_params) class Scope < ApplicationScope def resolve - scope.includes(:journal).where("published_at < ?", Time.zone.now) + scope.includes(:journal).where(published_at: ...Time.zone.now) .or(scope.includes(:journal).where(journal: {room: person.rooms})) end end