diff --git a/Gemfile.lock b/Gemfile.lock index 14dd52f..aae1b60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,36 +7,36 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.6) - actionpack (= 3.2.6) - mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) + actionmailer (3.2.19) + actionpack (= 3.2.19) + mail (~> 2.5.4) + actionpack (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) + journey (~> 1.0.4) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) - i18n (~> 0.6) + sprockets (~> 2.2) + activemodel (3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0) + activerecord (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + arel (~> 4.0) + tzinfo (~> 1.0) + activeresource (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + activesupport (3.2.19) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) acts-as-taggable-on (3.0.2) rails (>= 3, < 5) - arel (3.0.2) + arel (4.0.0) builder (3.0.0) capybara (2.1.0) mime-types (>= 1.16) @@ -73,17 +73,16 @@ GEM json (>= 1.4.6) hike (1.2.1) hpricot (0.8.6) - i18n (0.6.0) - journey (1.0.3) + i18n (0.6.9) + journey (1.0.4) json (1.7.3) locale (2.0.5) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) - mime-types (1.19) - mocha (0.11.3) + mime-types (1.25) + mocha (1.1.0) metaclass (~> 0.0.1) multi_json (1.3.6) nokogiri (1.5.5) @@ -91,29 +90,29 @@ GEM polyglot (0.3.3) prototype-rails (3.2.1) rails (~> 3.2) - rack (1.4.1) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) + rails (3.2.19) + actionmailer (= 3.2.19) + actionpack (= 3.2.19) + activerecord (= 3.2.19) + activeresource (= 3.2.19) + activesupport (= 3.2.19) bundler (~> 1.0) - railties (= 3.2.6) + railties (= 3.2.19) rails_autolink (1.1.5) rails (> 3.1) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + railties (3.2.19) + actionpack (= 3.2.19) + activesupport (= 3.2.19) rack-ssl (~> 1.3.2) rake (>= 0.8.7) - rdoc (~> 3.4) + rdoc (>= 3.4) thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rdoc (3.9.4) @@ -140,7 +139,7 @@ GEM multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) - sprockets (2.1.3) + sprockets (2.4.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -151,11 +150,13 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.15.3) + thread_safe (0.3.3) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (1.1.0) + thread_safe (~> 0.1) websocket (1.0.7) will_paginate (3.0.3) xpath (2.0.0) -- libgit2 0.21.2