diff --git a/Gemfile b/Gemfile index 7c342461..dacd77aa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rails', '3.2.11' -gem 'jquery-rails', '2.0.0' +gem 'jquery-rails', '3.1.5' gem 'bootstrap-sass', '2.0.0' gem 'bcrypt-ruby', '3.0.1' gem 'faker', '1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 67a6a03a..7d3d097f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,40 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) 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.2.1) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) 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.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.7) - arel (3.0.2) + arel (3.0.3) bcrypt-ruby (3.0.1) bootstrap-sass (2.0.0) bootstrap-will_paginate (0.0.5) will_paginate - builder (3.0.0) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -51,6 +51,7 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) + concurrent-ruby (1.2.2) cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -85,13 +86,14 @@ GEM guard-spork (0.3.2) guard (>= 0.8.4) spork (>= 0.8.4) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) - jquery-rails (2.0.0) - railties (>= 3.2.0.beta, < 5.0) - thor (~> 0.14) - json (1.6.6) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + jquery-rails (3.1.5) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (2.6.3) launchy (2.1.0) addressable (~> 2.2.6) mail (2.4.4) @@ -99,36 +101,35 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.18) - multi_json (1.2.0) + multi_json (1.15.0) nokogiri (1.5.2) pg (0.12.2) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.13.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.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.3) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) + thor (>= 0.14.6, < 2.0) + rake (13.0.6) rb-fsevent (0.4.3.1) - rdoc (3.12) - json (~> 1.4) + rdoc (3.9.5) rspec (2.9.0) rspec-core (~> 2.9.0) rspec-expectations (~> 2.9.0) @@ -154,18 +155,19 @@ GEM multi_json (~> 1.0) rubyzip spork (0.9.0) - sprockets (2.1.2) + sprockets (2.2.3) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.5) term-ansicolor (1.0.7) thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) + tzinfo (0.3.62) uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -189,10 +191,10 @@ DEPENDENCIES growl (= 1.0.3) guard-rspec (= 0.5.5) guard-spork (= 0.3.2) - jquery-rails (= 2.0.0) + jquery-rails (= 3.1.5) launchy (= 2.1.0) pg (= 0.12.2) - rails (= 3.2.3) + rails (= 3.2.11) rb-fsevent (= 0.4.3.1) rspec-rails (= 2.9.0) sass-rails (= 3.2.4)