diff --git a/Gemfile b/Gemfile index eda10dc..52efec9 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ ruby "1.9.3" gem 'rails', '3.2.11' -gem 'jquery-rails', '~> 2.1.2' +gem 'jquery-rails', '~> 3.1.3' gem 'bootstrap-sass', '~> 2.1.0.0' gem 'haml', '~> 3.1.7' gem 'simple_form', '~> 2.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index b7404fc..94ae335 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,6 +59,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) @@ -128,13 +129,14 @@ GEM activesupport (>= 3.1, < 4.1) haml (~> 3.1) railties (>= 3.1, < 4.1) - 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.2) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.7.6) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.7) launchy (2.1.2) addressable (~> 2.3) libnotify (0.7.4) @@ -161,7 +163,7 @@ GEM mongoid_magic_counter_cache (0.1.1) mongoid (>= 2.2, <= 3.0) rake - multi_json (1.5.0) + multi_json (1.14.1) newrelic_rpm (3.4.1) nokogiri (1.5.4) orm_adapter (0.4.0) @@ -172,14 +174,14 @@ GEM slop (~> 3.3.1) pry-rails (0.2.1) pry (>= 0.9.10) - rack (1.4.3) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.7.1) rack (>= 0.4) rack-livereload (0.3.6) rack - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.11) actionmailer (= 3.2.11) @@ -196,11 +198,11 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.3) + rake (12.2.1) random-word (1.3.0) rb-inotify (0.8.8) ffi (>= 0.5.0) - rdoc (3.12) + rdoc (3.12.2) json (~> 1.4) rolify (3.2.0) rspec (2.11.0) @@ -240,7 +242,7 @@ GEM spork-rails (3.2.0) rails (>= 3.0.0, < 3.3.0) spork (>= 1.0rc0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -250,8 +252,8 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.16.0) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -300,7 +302,7 @@ DEPENDENCIES guard-spork (~> 1.2.0) haml (~> 3.1.7) haml-rails (~> 0.3.5) - jquery-rails (~> 2.1.2) + jquery-rails (~> 3.1.3) launchy (~> 2.1.2) libnotify (~> 0.7.4) mongoid (~> 2.5.0)