diff --git a/Gemfile b/Gemfile index b1a3099..82100c6 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ group :assets do gem 'uglifier', '1.2.3' end -gem 'jquery-rails', '2.0.0' +gem 'jquery-rails', '3.1.3' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index c5a2162..fa22d74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,7 @@ GEM arel (3.0.2) bcrypt-ruby (3.0.1) bootstrap-sass (2.0.0) - builder (3.0.0) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -50,6 +50,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) diff-lcs (1.1.3) erubis (2.7.0) execjs (1.4.0) @@ -63,13 +64,14 @@ GEM guard-spork (0.3.2) guard (>= 0.8.4) spork (>= 0.8.4) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (2.0.0) - railties (>= 3.2.0.beta, < 5.0) - thor (~> 0.14) - json (1.7.3) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) libnotify (0.5.9) libwebsocket (0.1.4) addressable @@ -82,16 +84,16 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - multi_json (1.3.6) + multi_json (1.14.0) nokogiri (1.5.5) pg (0.12.2) polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.6) actionmailer (= 3.2.6) @@ -108,13 +110,13 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) + rake (13.0.0) rb-fchange (0.0.5) ffi rb-fsevent (0.9.1) rb-inotify (0.8.8) ffi (>= 0.5.0) - rdoc (3.12) + rdoc (3.12.2) json (~> 1.4) rspec (2.10.0) rspec-core (~> 2.10.0) @@ -141,13 +143,13 @@ GEM multi_json (~> 1.0) rubyzip spork (0.9.0) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.5) - thor (0.15.4) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1) @@ -169,7 +171,7 @@ DEPENDENCIES coffee-rails (= 3.2.2) guard-rspec (= 0.5.5) guard-spork (= 0.3.2) - jquery-rails (= 2.0.0) + jquery-rails (= 3.1.3) libnotify (= 0.5.9) pg (= 0.12.2) rails (= 3.2.6)