Skip to content

Commit

Permalink
Bump papertrail version (#12930)
Browse files Browse the repository at this point in the history
Bumps #12617 

### Description
Bumps PaperTrail to 9.1/9.2/10./10.3
(Going to push for the highest non-breaking!)

This gives us the ability to explicitly call for a papertrail creation without callbacks

### Acceptance Criteria
- [x] Papertrail continues to work!

### Testing Plan
1. Run the test suite
2. Manually test in console
  • Loading branch information
lomky authored and va-bot committed Dec 12, 2019
1 parent 62bd983 commit a4d7590
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ gem "newrelic_rpm"
# nokogiri 1.10.4 is vulnerable to CVE-2019-13117, CVE-2019-13118, CVE-2019-18197.
# https://github.com/sparklemotion/nokogiri/issues/1943
gem "nokogiri", "~> 1.10.5"
gem "paper_trail", "8.1.2"
gem "paper_trail", "~> 10"
# Used to speed up reporting
gem "parallel"
# soft delete gem
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ GEM
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
paper_trail (8.1.2)
activerecord (>= 4.2, < 5.2)
paper_trail (10.3.1)
activerecord (>= 4.2)
request_store (~> 1.1)
parallel (1.17.0)
paranoia (2.4.2)
Expand Down Expand Up @@ -605,7 +605,7 @@ DEPENDENCIES
multiverse
newrelic_rpm
nokogiri (~> 1.10.5)
paper_trail (= 8.1.2)
paper_trail (~> 10)
parallel
paranoia (~> 2.2)
pdf-forms
Expand Down
3 changes: 1 addition & 2 deletions config/initializers/paper_trail.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
PaperTrail.config.track_associations = false
PaperTrail::Rails::Engine.eager_load!

module PaperTrail
Expand All @@ -12,7 +11,7 @@ def user
# make sure whodunnit is set in console
Rails.application.configure do
console do
PaperTrail.whodunnit = ->() {
PaperTrail.request.whodunnit = ->() {
@paper_trail_whodunnit ||= (
until RequestStore[:current_user].present? do
puts "=" * 80
Expand Down
2 changes: 1 addition & 1 deletion spec/services/appeal_task_history_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
let(:user) { create(:user) }

before do
PaperTrail.whodunnit = user.id
PaperTrail.request.whodunnit = user.id
Timecop.freeze(Time.zone.now) # don't bother tracking timestamp changes in specs
end

Expand Down

0 comments on commit a4d7590

Please sign in to comment.