diff --git a/Gemfile b/Gemfile index 3f59333669..f36ddced18 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ gem 'roadie-rails', '~> 1.1.1' gem 'figaro' gem 'blockenspiel' gem 'acts-as-taggable-on', '~> 3.4' -gem 'paper_trail', '~> 3.0.8' +gem 'paper_trail', '~> 5.2.3' gem 'diffy' gem 'skylight', '< 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index f6f333df16..e4c65940d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -551,9 +551,9 @@ GEM rack (>= 1.2, < 3) oj (3.7.4) orm_adapter (0.5.0) - paper_trail (3.0.9) - activerecord (>= 3.0, < 5.0) - activesupport (>= 3.0, < 5.0) + paper_trail (5.2.3) + activerecord (>= 3.0, < 6.0) + request_store (~> 1.1) paperclip (3.5.4) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -629,6 +629,8 @@ GEM json (~> 1.4) redcarpet (3.2.3) ref (2.0.0) + request_store (1.4.1) + rack (>= 1.4) roadie (3.4.0) css_parser (~> 1.4) nokogiri (~> 1.5) @@ -748,9 +750,6 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket-driver (0.7.0) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) whenever (0.10.0) chronic (>= 0.6.3) wicked_pdf (1.1.0) @@ -819,7 +818,7 @@ DEPENDENCIES oauth2 (~> 1.4.1) ofn-qz! oj - paper_trail (~> 3.0.8) + paper_trail (~> 5.2.3) paperclip pg pry-byebug (>= 3.4.3)