diff --git a/Gemfile.lock b/Gemfile.lock index 4674cb3..b740f43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM multi_json (~> 1.0) arel (3.0.2) bootstrap-sass (2.1.1.0) - builder (3.0.0) + builder (3.0.4) coderay (1.0.6) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -47,20 +47,22 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.2.2) diff-lcs (1.1.3) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) - jquery-rails (3.0.4) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + jquery-rails (3.1.5) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.0.2) jquery-rails railties (>= 3.1.0) - json (1.6.6) + json (1.8.6) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -71,18 +73,18 @@ GEM treetop (~> 1.4.8) method_source (0.7.1) mime-types (1.18) - multi_json (1.3.2) + multi_json (1.15.0) polyglot (0.3.3) pry (0.9.9) coderay (~> 1.0.5) method_source (~> 0.7.1) slop (>= 2.4.4, < 3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.13.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.3) actionmailer (= 3.2.3) @@ -99,8 +101,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) + rake (13.0.6) + rdoc (3.12.2) json (~> 1.4) rr (1.0.4) rspec (2.9.0) @@ -123,13 +125,13 @@ GEM tilt (~> 1.3) slop (2.4.4) spork (0.9.0) - sprockets (2.1.2) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)