diff --git a/Gemfile.lock b/Gemfile.lock index eb084a2..3c47797 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,7 +32,7 @@ GEM arel (2.2.1) bcrypt-ruby (3.0.1) bluecloth (2.2.0) - builder (3.0.0) + builder (3.0.4) cgi_multipart_eof_fix (2.5.0) coffee-rails (3.1.1) coffee-script (>= 2.2.0) @@ -40,8 +40,9 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.3) + coffee-script-source (1.12.2) columnize (0.3.5) + concurrent-ruby (1.1.6) daemons (1.1.4) devise (1.5.2) bcrypt-ruby (~> 3.0) @@ -59,13 +60,14 @@ GEM friendly_id (4.0.0.beta14) gem_plugin (0.2.3) haml (3.1.4) - hike (1.2.1) + hike (1.2.3) hpricot (0.8.5) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) - json (1.6.3) + json (2.3.1) linecache (0.46) rbx-require-relative (> 0.0.4) mail (2.3.0) @@ -81,8 +83,7 @@ GEM daemons (>= 1.0.3) fastthread (>= 1.0.1) gem_plugin (>= 0.2.3) - multi_json (1.0.4) - mysql2 (0.3.11) + multi_json (1.15.0) nifty-generators (0.4.6) orm_adapter (0.0.5) pakunok (0.0.3) @@ -90,14 +91,14 @@ GEM rails (>= 3.1.0) sprockets (>= 2.0.0) polyglot (0.3.3) - rack (1.3.5) + rack (1.3.10) rack-cache (1.1) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) - 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.1.3) actionmailer (= 3.1.3) @@ -114,10 +115,9 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) + rake (13.0.1) rbx-require-relative (0.0.5) - rdoc (3.11) - json (~> 1.4) + rdoc (3.9.5) rest-client (1.6.7) mime-types (>= 1.16) rest-client-components (1.2.0) @@ -142,12 +142,13 @@ GEM rake (>= 0.9.2) rest-client (>= 1.6.6) yajl-ruby (>= 0.8.3) - sprockets (2.0.3) + sprockets (2.0.5) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sqlite3 (1.4.2) thor (0.14.6) - tilt (1.3.3) + tilt (1.3.7) treetop (1.4.10) polyglot polyglot (>= 0.3.1) @@ -175,7 +176,6 @@ DEPENDENCIES json mixlib-authentication mongrel - mysql2 nifty-generators pakunok rack-cache @@ -186,5 +186,6 @@ DEPENDENCIES ruby_parser sass-rails (~> 3.1.5) spice + sqlite3 uglifier (>= 1.0.3) yajl-ruby