diff --git a/Gemfile b/Gemfile index ece89ca..fc25d1a 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,6 @@ gem 'devise' gem 'devise_cas_authenticatable' gem 'jquery-rails', '~> 2.1' gem 'pg' -gem 'rails', '3.0.20' +gem 'rails', '3.2.17' gem 'ri_cal' gem 'unicorn' diff --git a/Gemfile.lock b/Gemfile.lock index 34ae689..e2c2ece 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,37 @@ GEM remote: http://rubygems.org/ specs: - abstract (1.0.0) - actionmailer (3.0.20) - actionpack (= 3.0.20) - mail (~> 2.2.19) - actionpack (3.0.20) - activemodel (= 3.0.20) - activesupport (= 3.0.20) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.5.0) - rack (~> 1.2.5) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) - activemodel (3.0.20) - activesupport (= 3.0.20) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.20) - activemodel (= 3.0.20) - activesupport (= 3.0.20) - arel (~> 2.0.10) - tzinfo (~> 0.3.23) - activeresource (3.0.20) - activemodel (= 3.0.20) - activesupport (= 3.0.20) - activesupport (3.0.20) - arel (2.0.10) + 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.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.17) + activesupport (= 3.2.17) + builder (~> 3.0.0) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + 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) + arel (3.0.3) bcrypt-ruby (3.0.1) - builder (2.1.2) + builder (3.0.4) + concurrent-ruby (1.1.5) devise (1.5.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) @@ -38,54 +39,64 @@ GEM devise_cas_authenticatable (1.1.2) devise (>= 1.0.6) rubycas-client (>= 2.2.1) - erubis (2.6.6) - abstract (>= 1.0.0) - i18n (0.5.4) + erubis (2.7.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) jquery-rails (2.2.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.2) + json (1.8.6) kgio (2.8.0) - mail (2.2.20) - activesupport (>= 2.3.6) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) + multi_json (1.14.1) orm_adapter (0.0.7) pg (0.16.0) polyglot (0.3.5) - rack (1.2.8) - rack-mount (0.6.14) - rack (>= 1.0.0) - rack-test (0.5.7) + rack (1.4.7) + rack-cache (1.7.1) + rack (>= 0.4) + rack-ssl (1.3.4) + rack + rack-test (0.6.3) rack (>= 1.0) - rails (3.0.20) - actionmailer (= 3.0.20) - actionpack (= 3.0.20) - activerecord (= 3.0.20) - activeresource (= 3.0.20) - activesupport (= 3.0.20) + 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.0.20) - railties (3.0.20) - actionpack (= 3.0.20) - activesupport (= 3.0.20) + 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.4) + thor (>= 0.14.6, < 2.0) raindrops (0.11.0) - rake (10.4.2) + rake (12.2.1) rdoc (3.12.2) json (~> 1.4) ri_cal (0.8.8) rubycas-client (2.3.9) activesupport - thor (0.14.6) + sprockets (2.2.3) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.42) + tzinfo (0.3.55) unicorn (4.6.3) kgio (~> 2.6) rack @@ -101,6 +112,6 @@ DEPENDENCIES devise_cas_authenticatable jquery-rails (~> 2.1) pg - rails (= 3.0.20) + rails (= 3.2.17) ri_cal unicorn