diff --git a/Gemfile.lock b/Gemfile.lock index 3822f12..ec6e38f 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) childprocess (0.3.1) ffi (~> 1.0.6) coderay (1.0.6) @@ -40,6 +40,7 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) + concurrent-ruby (1.2.2) diff-lcs (1.1.3) erubis (2.7.0) execjs (1.3.0) @@ -54,8 +55,9 @@ GEM multi_json thor haml (3.1.4) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jasmine (1.1.2) jasmine-core (>= 1.1.0) rack (>= 1.1) @@ -64,29 +66,29 @@ GEM jasmine-core (1.1.0) jasminerice (0.0.8) haml - journey (1.0.3) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.6.6) + journey (1.0.4) + jquery-rails (3.1.5) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.7.1) mime-types (1.18) - multi_json (1.2.0) + multi_json (1.15.0) 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.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) @@ -103,8 +105,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) + rake (13.0.6) + rdoc (3.12.2) json (~> 1.4) rspec (2.9.0) rspec-core (~> 2.9.0) @@ -131,12 +133,12 @@ GEM multi_json (~> 1.0) rubyzip slop (2.4.4) - sprockets (2.1.2) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)