diff --git a/Gemfile.lock b/Gemfile.lock index 2d2e29d1..ad8276be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,7 +41,7 @@ GEM childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) - atomic (1.1.9) + atomic (1.1.10) bcrypt-ruby (3.0.1) builder (3.1.4) bullet (4.6.0) @@ -63,12 +63,13 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.2) - cucumber (1.3.2) + coffee-script-source (1.6.3) + cucumber (1.3.5) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12.0) - multi_json (~> 1.3) + multi_json (~> 1.7.5) + multi_test (>= 0.0.2) cucumber-rails (1.3.0) capybara (>= 1.1.2) cucumber (>= 1.1.8) @@ -89,7 +90,7 @@ GEM hike (1.2.3) htmlentities (4.3.1) i18n (0.6.4) - jquery-rails (3.0.1) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) libv8 (3.11.8.17) @@ -98,17 +99,18 @@ GEM treetop (~> 1.4.8) metaclass (0.0.1) mime-types (1.23) - mini_portile (0.5.0) + mini_portile (0.5.1) minitest (4.7.5) mocha (0.14.0) metaclass (~> 0.0.1) multi_json (1.7.7) - mysql2 (0.3.11) + multi_test (0.0.2) + mysql2 (0.3.13) nokogiri (1.6.0) mini_portile (~> 0.5.0) polyglot (0.3.3) rack (1.5.2) - rack-mini-profiler (0.1.26) + rack-mini-profiler (0.1.27) rack (>= 1.1.3) rack-test (0.6.2) rack (>= 1.0) @@ -129,13 +131,13 @@ GEM thor (>= 0.18.1, < 2.0) rake (10.1.0) ref (1.0.5) - rspec-expectations (2.13.0) + rspec-expectations (2.14.0) diff-lcs (>= 1.1.3, < 2.0) rubyzip (0.9.9) - safe_yaml (0.9.3) - sanitize (2.0.4) - nokogiri (~> 1.6.0) - sass (3.2.9) + safe_yaml (0.9.4) + sanitize (2.0.6) + nokogiri (>= 1.4.4) + sass (3.2.10) sass-rails (4.0.0) railties (>= 4.0.0.beta, < 5.0) sass (>= 3.1.10) @@ -166,18 +168,18 @@ GEM libv8 (~> 3.11.8.12) ref thor (0.18.1) - thread_safe (0.1.0) + thread_safe (0.1.2) atomic tilt (1.4.1) timecop (0.6.2.2) - tolk (1.3.9) + tolk (1.3.11) safe_yaml (~> 0.8) will_paginate treetop (1.4.14) polyglot polyglot (>= 0.3.1) tzinfo (0.3.37) - uglifier (2.1.1) + uglifier (2.1.2) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) uniform_notifier (1.2.0) @@ -185,7 +187,7 @@ GEM will_paginate (3.0.4) xpath (2.0.0) nokogiri (~> 1.3) - yard (0.8.6.1) + yard (0.8.7) PLATFORMS ruby