diff --git a/Gemfile.lock b/Gemfile.lock index 11aa934..722e9fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,7 +29,7 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) - builder (3.0.0) + builder (3.0.4) capistrano (2.9.0) highline net-scp (>= 1.0.0) @@ -47,10 +47,8 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) - coffeebeans (1.0.1) - actionpack (>= 3.0.0) - coffee-script commonjs (0.2.5) + concurrent-ruby (1.1.5) erubis (2.7.0) execjs (1.3.0) multi_json (~> 1.0) @@ -61,13 +59,14 @@ GEM haml (~> 3.0) railties (~> 3.0) highline (1.6.11) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.6.6) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) less (2.0.11) commonjs (~> 0.2.0) therubyracer (~> 0.9.9) @@ -80,7 +79,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.18) - multi_json (1.2.0) + multi_json (1.14.1) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -95,12 +94,12 @@ GEM cocaine (>= 0.0.2) mime-types polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.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) @@ -117,15 +116,15 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) + rake (13.0.0) + rdoc (3.12.2) json (~> 1.4) sass (3.1.15) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.2) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -133,7 +132,7 @@ GEM therubyracer (0.9.10) libv8 (~> 3.3.10) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1) @@ -153,7 +152,6 @@ DEPENDENCIES capistrano chosen-rails coffee-rails (~> 3.2.1) - coffeebeans haml (>= 3.1.4) haml-rails (>= 0.3.4) jquery-rails