diff --git a/Gemfile b/Gemfile index ece89ca..5a1bb66 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby "1.9.3" gem 'devise' gem 'devise_cas_authenticatable' -gem 'jquery-rails', '~> 2.1' +gem 'jquery-rails', '~> 3.1' gem 'pg' gem 'rails', '3.0.20' gem 'ri_cal' diff --git a/Gemfile.lock b/Gemfile.lock index 34ae689..20c8143 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,10 +41,10 @@ GEM erubis (2.6.6) abstract (>= 1.0.0) i18n (0.5.4) - jquery-rails (2.2.0) + jquery-rails (3.1.3) 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) @@ -75,7 +75,7 @@ GEM rdoc (~> 3.4) thor (~> 0.14.4) raindrops (0.11.0) - rake (10.4.2) + rake (12.2.1) rdoc (3.12.2) json (~> 1.4) ri_cal (0.8.8) @@ -85,7 +85,7 @@ GEM 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 @@ -99,7 +99,7 @@ PLATFORMS DEPENDENCIES devise devise_cas_authenticatable - jquery-rails (~> 2.1) + jquery-rails (~> 3.1) pg rails (= 3.0.20) ri_cal