diff --git a/Gemfile.lock b/Gemfile.lock index 03983fa..545ea1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,40 +29,42 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.0) - builder (3.0.0) + builder (3.0.4) cocaine (0.2.1) + concurrent-ruby (1.2.2) erubis (2.7.0) git (1.2.5) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jeweler (1.8.3) bundler (~> 1.0) git (>= 1.2.5) rake rdoc - journey (1.0.1) - jquery-rails (2.0.0) - railties (>= 3.2.0.beta, < 5.0) - thor (~> 0.14) - json (1.6.5) + journey (1.0.4) + jquery-rails (3.1.5) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) mail (2.4.1) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.17.2) - multi_json (1.0.4) + multi_json (1.15.0) paperclip (2.5.2) activerecord (>= 2.3.0) activesupport (>= 2.3.2) cocaine (>= 0.0.2) mime-types polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.1) + 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.1) actionmailer (= 3.2.1) @@ -79,16 +81,16 @@ 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) - sprockets (2.1.2) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.5) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)