diff --git a/Gemfile b/Gemfile index c679621..79fe80c 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ group :assets do gem 'uglifier', '>= 1.0.3' gem 'twitter-bootstrap-rails', '2.1.3' - gem 'jquery-rails', '2.1.1' + gem 'jquery-rails', '3.1.3' gem 'jquery-ui-rails', '2.0.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 79b1ea4..0903c43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,6 +63,7 @@ GEM coffee-script-source (1.3.3) columnize (0.3.6) commonjs (0.2.6) + concurrent-ruby (1.1.5) daemons (1.1.8) debug_inspector (0.0.2) devise (2.1.2) @@ -86,16 +87,17 @@ GEM gravatar_image_tag (1.1.3) haml (3.1.3) highline (1.6.12) - hike (1.2.1) - i18n (0.6.1) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (2.1.1) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) jquery-ui-rails (2.0.0) jquery-rails railties (>= 3.1.0) - json (1.7.7) + json (1.8.6) json_pure (1.6.4) less (2.2.1) commonjs (~> 0.2.6) @@ -114,18 +116,18 @@ GEM rack-contrib rails mime-types (1.21) - multi_json (1.6.1) + multi_json (1.14.1) mysql2 (0.3.11) orm_adapter (0.4.0) polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) rack-contrib (1.1.0) rack (>= 0.9.1) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.12) actionmailer (= 3.2.12) @@ -146,8 +148,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.3) - rdoc (3.12.1) + rake (13.0.0) + rdoc (3.12.2) json (~> 1.4) rspec (2.8.0) rspec-core (~> 2.8.0) @@ -187,7 +189,7 @@ GEM simple_form (2.0.0) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -200,8 +202,8 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.17.0) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) timecop (0.3.5) treetop (1.4.12) polyglot @@ -236,7 +238,7 @@ DEPENDENCIES exception_notification (~> 2.6.1) factory_girl_rails gravatar_image_tag (= 1.1.3) - jquery-rails (= 2.1.1) + jquery-rails (= 3.1.3) jquery-ui-rails (= 2.0.0) magic_encoding meta_request