diff --git a/Gemfile.lock b/Gemfile.lock index 3a0e74a85..d860c2e73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM capybara-webkit (1.0.0) capybara (~> 2.0, >= 2.0.2) json - childprocess (0.3.9) + childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) chunky_png (1.2.9) coffee-rails (4.0.1) @@ -96,7 +96,7 @@ GEM mime-types (1.25.1) mini_portile (0.5.2) minitest (4.7.5) - multi_json (1.8.4) + multi_json (1.10.1) mysql2 (0.3.14) nokogiri (1.6.0) mini_portile (~> 0.5.0) @@ -145,16 +145,16 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rubyzip (1.0.0) + rubyzip (1.1.4) sass (3.2.12) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) - selenium-webdriver (2.37.0) - childprocess (>= 0.2.5) + selenium-webdriver (2.42.0) + childprocess (>= 0.5.0) multi_json (~> 1.0) - rubyzip (~> 1.0.0) + rubyzip (~> 1.0) websocket (~> 1.0.4) sprockets (2.10.1) hike (~> 1.2)