diff --git a/Gemfile b/Gemfile index 3db0f6e..f029cf4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.3' +gem 'rails', '3.2.17' gem 'mysql2' gem 'pivotal-tracker' gem 'google_calendar' diff --git a/Gemfile.lock b/Gemfile.lock index c050fac..75043a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) - mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + 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.2) - activemodel (3.2.3) - activesupport (= 3.2.3) + sprockets (~> 2.2.1) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) - 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.3.2) - arel (3.0.2) - builder (3.0.0) + arel (3.0.3) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -47,6 +47,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) crack (0.3.1) cucumber (1.2.1) builder (>= 2.1.2) @@ -75,63 +76,59 @@ GEM nokogiri (>= 1.4.4) happymapper (0.4.0) libxml-ruby (~> 2.0) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.7.4) + json (2.2.0) libwebsocket (0.1.5) addressable libxml-ruby (2.3.3) - 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.11.4) metaclass (~> 0.0.1) - multi_json (1.3.6) + multi_json (1.14.1) mysql2 (0.3.11) nifty-generators (0.4.6) nokogiri (1.5.5) pivotal-tracker (0.5.4) builder - builder - happymapper (>= 0.3.2) happymapper (>= 0.3.2) nokogiri (>= 1.4.3) nokogiri (~> 1.4) rest-client (~> 1.6.0) - rest-client (~> 1.6.0) - 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.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + 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.3) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + 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) + thor (>= 0.14.6, < 2.0) rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) + rdoc (3.9.5) rest-client (1.6.7) mime-types (>= 1.16) rspec (2.11.0) @@ -164,16 +161,17 @@ GEM simplecov-html (0.5.3) simplecov-rcov (0.2.3) simplecov (>= 0.4.1) - sprockets (2.1.3) + sprockets (2.2.3) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) + thor (0.20.3) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.55) uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) @@ -197,7 +195,7 @@ DEPENDENCIES mysql2 nifty-generators pivotal-tracker - rails (= 3.2.3) + rails (= 3.2.17) rake rspec-rails sass-rails (~> 3.2.3)