Merge branch 'hotfix' into bugfixes

gems-uff · Jan 22, 2019 · 499f9ae · 499f9ae
2 parents 131794b + 874361a
commit 499f9ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -12,6 +12,7 @@ gem 'loofah', '~> 2.2.3'
 gem 'rails-html-sanitizer', '~> 1.0.4'
 gem 'rack', '>= 2.0.6'
 gem 'ffi', '>= 1.9.24'
+gem "nokogiri", ">= 1.8.5"
 
 gem 'rspec-collection_matchers'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -336,6 +336,7 @@ DEPENDENCIES
   kaminari
   loofah (~> 2.2.3)
   mysql2
+  nokogiri (>= 1.8.5)
   odf-report
   paper_trail
   prawn