diff --git a/Gemfile b/Gemfile index b59f205..e9da7c8 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ group :assets do gem 'uglifier', '~> 1.2.4' end -gem 'jquery-rails', '~> 2.0.2' +gem 'jquery-rails', '~> 3.1.3' # Deploy with Capistrano gem 'capistrano', '~> 2.12.0' diff --git a/Gemfile.lock b/Gemfile.lock index 27c0bb2..13b1311 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,6 +60,7 @@ GEM execjs coffee-script-source (1.3.3) columnize (0.3.6) + concurrent-ruby (1.1.5) daemons (1.1.8) debugger (1.1.4) columnize (>= 0.3.1) @@ -86,14 +87,15 @@ GEM i18n (~> 0.4) gabba (1.0.1) highline (1.6.13) - hike (1.2.2) + hike (1.2.3) htmlentities (4.3.3) - i18n (0.6.4) + 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.8.0) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) @@ -106,7 +108,7 @@ GEM treetop (~> 1.4.8) mime-types (1.23) mini_portile (0.6.2) - multi_json (1.7.4) + multi_json (1.13.1) mysql2 (0.3.11) mysql2 (0.3.11-x86-mingw32) net-scp (1.0.4) @@ -134,13 +136,13 @@ GEM polyglot (0.3.3) quiet_assets (1.0.1) railties (~> 3.1) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack rack-ssl-enforcer (0.2.4) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.12) actionmailer (= 3.2.12) @@ -159,7 +161,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.4) + rake (13.0.0) randumb (0.3.1) activerecord (>= 3.0.0) activesupport (>= 3.0.0) @@ -175,7 +177,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -193,7 +195,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.18.1) + thor (0.20.3) tilt (1.4.1) timecop (0.3.5) treetop (1.4.12) @@ -227,7 +229,7 @@ DEPENDENCIES factory_girl_rails (~> 3.4.0) faker (~> 1.0.1) gabba (~> 1.0.1) - jquery-rails (~> 2.0.2) + jquery-rails (~> 3.1.3) jsonify (~> 0.3.1) jsonify-rails (~> 0.3.2) mime-types (~> 1.18)