diff --git a/Gemfile.lock b/Gemfile.lock index 0e459e8c..6de3ef0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,16 +48,16 @@ GEM bcrypt (>= 3.1.3) bluecloth (2.2.0) builder (3.0.4) - bullet (4.8.0) + bullet (4.9.0) activesupport - uniform_notifier (>= 1.4.0) + uniform_notifier (~> 1.6.0) capybara (2.2.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.5.1) + childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -66,17 +66,18 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - cucumber (1.3.11) + cucumber (1.3.15) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.0.2) - cucumber-rails (1.4.0) - capybara (>= 1.1.2) - cucumber (>= 1.2.0) - nokogiri (>= 1.5.0) - rails (>= 3.0.0) + multi_test (>= 0.1.1) + cucumber-rails (1.4.1) + capybara (>= 1.1.2, < 3) + cucumber (>= 1.3.8, < 2) + mime-types (~> 1.16) + nokogiri (~> 1.5) + rails (>= 3, < 5) database_cleaner (0.9.1) diff-lcs (1.2.5) docile (1.1.3) @@ -84,7 +85,7 @@ GEM execjs (2.0.2) factory_girl (4.4.0) activesupport (>= 3.0.0) - factory_girl_rails (4.4.0) + factory_girl_rails (4.4.1) factory_girl (~> 4.4.0) railties (>= 3.0.0) ffi (1.9.3) @@ -107,17 +108,17 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - mini_portile (0.5.3) + mini_portile (0.6.0) multi_json (1.10.0) - multi_test (0.0.3) - mysql2 (0.3.15) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + multi_test (0.1.1) + mysql2 (0.3.16) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) polyglot (0.3.4) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-mini-profiler (0.9.0) + rack-mini-profiler (0.9.1) rack (>= 1.1.3) rack-ssl (1.3.4) rack @@ -140,22 +141,22 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.3.1) + rake (10.3.2) rdoc (3.12.2) json (~> 1.4) ref (1.0.5) rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) - rubyzip (1.1.0) + rubyzip (1.1.3) safe_yaml (0.9.7) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.2.14) + sass (3.3.7) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.40.0) + selenium-webdriver (2.41.0) childprocess (>= 0.5.0) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -180,7 +181,7 @@ GEM thor (0.19.1) tilt (1.4.1) timecop (0.7.1) - tolk (1.3.12) + tolk (1.5.0) safe_yaml (~> 0.8) will_paginate treetop (1.4.15) @@ -190,12 +191,12 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - uniform_notifier (1.4.0) + uniform_notifier (1.6.1) websocket (1.0.7) will_paginate (3.0.5) xpath (2.0.0) nokogiri (~> 1.3) - yard (0.8.7.3) + yard (0.8.7.4) PLATFORMS ruby