diff --git a/Gemfile b/Gemfile index 1bffca9..31cc888 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem 'rails3-jquery-autocomplete' gem 'nifty-generators' gem 'will_paginate' gem 'will_paginate-bootstrap' -gem 'nokogiri', '1.6.7' +gem 'nokogiri', '1.12.5' gem 'bcrypt-ruby', :require => 'bcrypt' gem 'slim-rails' diff --git a/Gemfile.lock b/Gemfile.lock index d7cea73..841adbb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,14 +149,17 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2019.0904) mini_mime (1.0.2) - mini_portile2 (2.0.0) + mini_portile2 (2.6.1) minitest (5.12.2) multi_json (1.13.1) multi_test (0.1.2) nifty-generators (0.4.6) - nokogiri (1.6.7) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) + pg (1.2.3) public_suffix (3.1.1) + racc (1.5.2) rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) @@ -294,7 +297,8 @@ DEPENDENCIES jbuilder (~> 2.0) jquery-rails nifty-generators - nokogiri (= 1.6.7) + nokogiri (= 1.12.5) + pg rails (= 4.2.5) rails3-jquery-autocomplete rails_12factor @@ -304,7 +308,7 @@ DEPENDENCIES selenium-webdriver slim-rails spring - sqlite3 (~> 1.3.6) + sqlite3 turbolinks twitter-bootstrap-rails uglifier (>= 1.3.0)