diff --git a/Gemfile.lock b/Gemfile.lock index e5876df..c9bdc12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ GEM multi_json (~> 1.0) arel (3.0.2) bcrypt-ruby (3.0.1) - builder (3.0.0) + builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -38,41 +38,42 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.2.2) devise (2.0.4) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) railties (~> 3.1) warden (~> 1.1.1) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.8.1) haml (3.1.4) haml-rails (0.3.4) actionpack (~> 3.0) activesupport (~> 3.0) haml (~> 3.0) railties (~> 3.0) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.7.3) + json (2.6.3) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.18) - multi_json (1.3.6) + multi_json (1.15.0) orm_adapter (0.0.7) polyglot (0.3.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) @@ -89,28 +90,27 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) + rake (13.0.6) + rdoc (3.9.5) sass (3.1.19) sass-rails (3.2.5) 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.6) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - uglifier (1.2.4) + uglifier (2.7.2) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + json (>= 1.8.0) warden (1.1.1) rack (>= 1.0)