diff --git a/Gemfile.lock b/Gemfile.lock index 07b980d..ef83810 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ GEM multi_json (~> 1.0) ansi (1.4.2) arel (3.0.2) - builder (3.0.0) + builder (3.0.4) coderay (1.0.6) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -40,17 +40,19 @@ GEM execjs coffee-script-source (1.2.0) commonjs (0.2.5) + concurrent-ruby (1.1.5) daemons (1.1.8) erubis (2.7.0) eventmachine (0.12.10) execjs (1.3.0) multi_json (~> 1.0) - 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) + 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.6.6) less (2.1.0) commonjs (~> 0.2.0) @@ -69,18 +71,18 @@ GEM minitest-spec-rails (3.0.1) minitest (~> 2.11) rails (~> 3.0) - multi_json (1.2.0) + multi_json (1.14.1) polyglot (0.3.3) pry (0.9.8.4) coderay (~> 1.0.5) method_source (~> 0.7.1) slop (>= 2.4.4, < 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.3) actionmailer (= 3.2.3) @@ -97,8 +99,8 @@ 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) @@ -107,7 +109,7 @@ GEM tilt (~> 1.3) serialport (1.0.4) slop (2.4.4) - sprockets (2.1.2) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -119,7 +121,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)