diff --git a/Gemfile b/Gemfile index 24ddb1f..71e0ac6 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'bourbon', '2.1.0' gem 'formtastic', '2.0.2' gem 'htmldiff', '0.0.1' gem 'pg', '0.13.2' -gem 'rails', '3.2.6' +gem 'rails', '3.2.17' gem 'thin', '1.3.1' gem 'yajl-ruby', '1.1.0', :require => 'yajl' gem "jquery-rails", "1.0.19" diff --git a/Gemfile.lock b/Gemfile.lock index c01079b..3e72395 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,40 +5,40 @@ GEM Platform (>= 0.4.0) open4 Platform (0.4.0) - actionmailer (3.2.6) - actionpack (= 3.2.6) - mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + actionmailer (3.2.17) + actionpack (= 3.2.17) + mail (~> 2.5.4) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) + journey (~> 1.0.4) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) + sprockets (~> 2.2.1) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) - i18n (~> 0.6) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.2.7) - arel (3.0.2) + arel (3.0.3) bourbon (2.1.0) sass (>= 3.1) bourne (1.1.1) mocha (= 0.10.4) - builder (3.0.0) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -58,6 +58,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.1) + concurrent-ruby (1.1.5) cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -91,55 +92,55 @@ GEM rails (~> 3.0) gherkin (2.9.0) json (>= 1.4.6) - hike (1.2.1) + hike (1.2.3) htmldiff (0.0.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) - json (1.7.3) + json (1.8.6) launchy (2.0.5) addressable (~> 2.2.6) libwebsocket (0.1.3) addressable - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) - mime-types (1.19) + mime-types (1.25.1) mocha (0.10.4) metaclass (~> 0.0.1) - multi_json (1.3.6) + multi_json (1.14.0) nokogiri (1.5.4) open4 (1.3.0) pg (0.13.2) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.6) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) + rake (13.0.0) + rdoc (3.12.2) json (~> 1.4) rspec (2.8.0) rspec-core (~> 2.8.0) @@ -167,8 +168,9 @@ GEM rubyzip shoulda-matchers (1.0.0) spork (0.9.0) - sprockets (2.1.3) + sprockets (2.2.3) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) term-ansicolor (1.0.7) @@ -176,13 +178,13 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.15.3) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) timecop (0.3.5) - treetop (1.4.10) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.55) uglifier (1.2.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -212,7 +214,7 @@ DEPENDENCIES jquery-rails (= 1.0.19) launchy (= 2.0.5) pg (= 0.13.2) - rails (= 3.2.6) + rails (= 3.2.17) rspec-rails (= 2.8.1) sass-rails (~> 3.2.5) shoulda-matchers (= 1.0.0)