diff --git a/Gemfile.lock b/Gemfile.lock index 038f46f..108fd4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.1.5) devise (2.2.4) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -46,26 +47,27 @@ GEM erubis (2.7.0) execjs (2.0.2) hike (1.2.3) - i18n (0.6.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (3.0.4) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (1.8.6) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25) - multi_json (1.8.0) + multi_json (1.13.1) orm_adapter (0.4.0) polyglot (0.3.3) - 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-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.8) actionmailer (= 3.2.8) @@ -82,7 +84,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.1.0) + rake (12.3.3) rdoc (3.12.2) json (~> 1.4) sass (3.2.11) @@ -90,12 +92,12 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.8) - thor (0.18.1) + thor (0.20.3) tilt (1.4.1) treetop (1.4.15) polyglot