diff --git a/Gemfile b/Gemfile index 47989c8d..719e700e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.3' +gem 'rails' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -72,6 +72,7 @@ group :test do gem "database_cleaner" gem "cucumber-rails" gem "aruba" + gem "therubyracer" # uncomment to use the webkit option. This depends on Qt to be installed #gem "capybara-webkit" diff --git a/Gemfile.lock b/Gemfile.lock index 6f52bf1c..b3bf4c46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,33 +2,32 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - aasm (3.0.6) - activerecord - actionmailer (3.2.3) - actionpack (= 3.2.3) + aasm (3.0.7) + actionmailer (3.2.6) + actionpack (= 3.2.6) mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + actionpack (3.2.6) + activemodel (= 3.2.6) + activesupport (= 3.2.6) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.1) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.3) - activesupport (= 3.2.3) + sprockets (~> 2.1.3) + activemodel (3.2.6) + activesupport (= 3.2.6) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.6) + activemodel (= 3.2.6) + activesupport (= 3.2.6) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) + activeresource (3.2.6) + activemodel (= 3.2.6) + activesupport (= 3.2.6) + activesupport (3.2.6) i18n (~> 0.6) multi_json (~> 1.0) acts_as_list (0.1.6) @@ -58,25 +57,25 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) - cucumber (1.2.0) + cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) - gherkin (~> 2.10.0) + gherkin (~> 2.11.0) json (>= 1.4.6) cucumber-rails (1.3.0) capybara (>= 1.1.2) cucumber (>= 1.1.8) nokogiri (>= 1.5.0) daemons (1.0.10) - database_cleaner (0.7.2) + database_cleaner (0.8.0) diff-lcs (1.1.3) erubis (2.7.0) - execjs (1.3.2) + execjs (1.4.0) multi_json (~> 1.0) - factory_girl (3.3.0) + factory_girl (3.4.0) activesupport (>= 3.0.0) - factory_girl_rails (3.3.0) - factory_girl (~> 3.3.0) + factory_girl_rails (3.4.0) + factory_girl (~> 3.4.0) railties (>= 3.0.0) ffi (1.0.11) formatize (1.1.0) @@ -84,16 +83,17 @@ GEM actionpack (~> 3.0) bluecloth (~> 2.2) gem_plugin (0.2.3) - gherkin (2.10.0) + gherkin (2.11.0) json (>= 1.4.6) hike (1.2.1) htmlentities (4.3.1) i18n (0.6.0) - journey (1.0.3) + journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.7.3) + libv8 (3.3.10.4) libwebsocket (0.1.3) addressable mail (2.4.4) @@ -104,9 +104,9 @@ GEM mongrel (1.2.0.pre2) daemons (~> 1.0.10) gem_plugin (~> 0.2.3) - multi_json (1.3.5) + multi_json (1.3.6) mysql2 (0.3.11) - nokogiri (1.5.2) + nokogiri (1.5.4) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -115,23 +115,23 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + rails (3.2.6) + actionmailer (= 3.2.6) + actionpack (= 3.2.6) + activerecord (= 3.2.6) + activeresource (= 3.2.6) + activesupport (= 3.2.6) bundler (~> 1.0) - railties (= 3.2.3) - rails_autolink (1.0.7) + railties (= 3.2.6) + rails_autolink (1.0.9) rails (~> 3.1) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + railties (3.2.6) + actionpack (= 3.2.6) + activesupport (= 3.2.6) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) + thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rdoc (3.12) json (~> 1.4) @@ -139,19 +139,19 @@ GEM rspec-core (~> 2.10.0) rspec-expectations (~> 2.10.0) rspec-mocks (~> 2.10.0) - rspec-core (2.10.0) + rspec-core (2.10.1) rspec-expectations (2.10.0) diff-lcs (~> 1.1.3) rspec-mocks (2.10.1) rubyzip (0.9.8) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.1.18) + sass (3.1.19) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.21.2) + selenium-webdriver (2.22.2) childprocess (>= 0.2.5) ffi (~> 1.0) libwebsocket (~> 0.1.3) @@ -165,7 +165,9 @@ GEM swf_fu (2.0.2) coffee-script rails (>= 3.1) - thor (0.14.6) + therubyracer (0.10.1) + libv8 (~> 3.3.10) + thor (0.15.2) tilt (1.3.3) treetop (1.4.10) polyglot @@ -177,7 +179,7 @@ GEM will_paginate (3.0.3) xpath (0.1.4) nokogiri (~> 1.3) - yard (0.8.1) + yard (0.8.2.1) PLATFORMS ruby @@ -198,13 +200,14 @@ DEPENDENCIES jquery-rails mongrel (= 1.2.0.pre2) mysql2 - rails (= 3.2.3) + rails rails_autolink sanitize sass-rails (~> 3.2.3) selenium-webdriver sqlite3 swf_fu + therubyracer uglifier (>= 1.0.3) will_paginate yard