diff --git a/Gemfile.lock b/Gemfile.lock index ea27534f..a0fa614b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - aasm (3.0.16) + aasm (3.0.19) actionmailer (3.2.13) actionpack (= 3.2.13) mail (~> 2.5.3) @@ -36,25 +36,25 @@ GEM activesupport (3.2.13) i18n (= 0.6.1) multi_json (~> 1.0) - acts_as_list (0.1.9) + acts_as_list (0.2.0) + activerecord (>= 3.0) arel (3.0.2) - aruba (0.5.1) - childprocess (~> 0.3.6) + aruba (0.5.3) + childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) bcrypt-ruby (3.0.1) bluecloth (2.2.0) builder (3.0.4) - bullet (4.3.0) + bullet (4.6.0) uniform_notifier - capybara (2.0.2) + capybara (2.1.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - selenium-webdriver (~> 2.0) - xpath (~> 1.0.0) - childprocess (0.3.8) + xpath (~> 2.0) + childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -62,18 +62,19 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) - cucumber (1.2.1) + coffee-script-source (1.6.2) + cucumber (1.3.2) builder (>= 2.1.2) diff-lcs (>= 1.1.3) - gherkin (~> 2.11.0) - json (>= 1.4.6) - cucumber-rails (1.3.0) + gherkin (~> 2.12.0) + multi_json (~> 1.3) + cucumber-rails (1.3.1) capybara (>= 1.1.2) - cucumber (>= 1.1.8) + cucumber (>= 1.2.0) nokogiri (>= 1.5.0) + rails (~> 3.0) database_cleaner (0.9.1) - diff-lcs (1.1.3) + diff-lcs (1.2.4) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -82,35 +83,36 @@ GEM factory_girl_rails (4.2.1) factory_girl (~> 4.2.0) railties (>= 3.0.0) - ffi (1.3.1) + ffi (1.9.0) formatize (1.1.0) RedCloth (~> 4.2) actionpack (~> 3.0) bluecloth (~> 2.2) - gherkin (2.11.6) - json (>= 1.7.6) - hike (1.2.1) + gherkin (2.12.0) + multi_json (~> 1.3) + hike (1.2.3) htmlentities (4.3.1) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.2.1) + jquery-rails (2.3.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) + json (1.8.0) libv8 (3.11.8.17) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.21) - multi_json (1.7.0) + mime-types (1.23) + mini_portile (0.5.0) + multi_json (1.7.7) mysql2 (0.3.11) - nokogiri (1.5.6) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) polyglot (0.3.3) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-mini-profiler (0.1.23) + rack-mini-profiler (0.1.26) rack (>= 1.1.3) rack-ssl (1.3.3) rack @@ -124,8 +126,8 @@ GEM activesupport (= 3.2.13) bundler (~> 1.0) railties (= 3.2.13) - rails_autolink (1.0.9) - rails (~> 3.1) + rails_autolink (1.1.0) + rails (> 3.1) railties (3.2.13) actionpack (= 3.2.13) activesupport (= 3.2.13) @@ -133,22 +135,22 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.3) + rake (10.0.4) rdoc (3.12.2) json (~> 1.4) - ref (1.0.4) - rspec-expectations (2.12.1) - diff-lcs (~> 1.1.3) + ref (1.0.5) + rspec-expectations (2.13.0) + diff-lcs (>= 1.1.3, < 2.0) rubyzip (0.9.9) - safe_yaml (0.7.1) - sanitize (2.0.3) - nokogiri (>= 1.4.4, < 1.6) - sass (3.2.5) + safe_yaml (0.9.3) + sanitize (2.0.4) + nokogiri (~> 1.6.0) + sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.29.0) + selenium-webdriver (2.33.0) childprocess (>= 0.2.5) multi_json (~> 1.0) rubyzip @@ -163,31 +165,31 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) - swf_fu (2.0.3) + swf_fu (2.0.4) coffee-script rails (>= 3.1) therubyracer (0.11.4) libv8 (~> 3.11.8.12) ref - thor (0.17.0) - tilt (1.3.6) - timecop (0.5.9.2) - tolk (1.3.5) - safe_yaml + thor (0.18.1) + tilt (1.4.1) + timecop (0.6.1) + tolk (1.3.9) + safe_yaml (~> 0.8) will_paginate - treetop (1.4.12) + treetop (1.4.14) polyglot polyglot (>= 0.3.1) tzinfo (0.3.37) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - uniform_notifier (1.1.1) + uniform_notifier (1.2.0) websocket (1.0.7) will_paginate (3.0.4) - xpath (1.0.0) + xpath (2.0.0) nokogiri (~> 1.3) - yard (0.8.4.1) + yard (0.8.6.1) PLATFORMS ruby