diff --git a/Gemfile b/Gemfile index d2d957656..267f7b43c 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'rails-settings-cached', '0.4.1' # for settings # html-xml gem 'haml-rails', '0.9.0' # haml for views -gem 'nokogiri', '1.7.1' # For XML parsing +gem 'nokogiri', '~> 1.7' # style gem 'bootstrap-sass', '3.3.5.1' # bootstrap style diff --git a/Gemfile.lock b/Gemfile.lock index 3a1954029..f1e98d929 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM multi_json (1.12.1) multi_xml (0.6.0) netrc (0.11.0) - nokogiri (1.7.1) + nokogiri (1.7.2) mini_portile2 (~> 2.1.0) nori (2.6.0) nprogress-rails (0.1.6.7) @@ -537,7 +537,7 @@ DEPENDENCIES liquid (= 3.0.6) mina (= 0.3.1) money-rails - nokogiri (= 1.7.1) + nokogiri (~> 1.7) nprogress-rails (= 0.1.6.7) paper_trail! pdfkit (= 0.6.2)