diff --git a/Gemfile.lock b/Gemfile.lock index b71d1222..8b1eb667 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,30 +3,30 @@ GEM specs: RedCloth (4.2.9) aasm (3.4.0) - actionmailer (4.1.11) - actionpack (= 4.1.11) - actionview (= 4.1.11) + actionmailer (4.1.14.1) + actionpack (= 4.1.14.1) + actionview (= 4.1.14.1) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.11) - actionview (= 4.1.11) - activesupport (= 4.1.11) + actionpack (4.1.14.1) + actionview (= 4.1.14.1) + activesupport (= 4.1.14.1) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-xml_parser (1.0.1) actionpack (>= 4.0.0.rc1) - actionview (4.1.11) - activesupport (= 4.1.11) + actionview (4.1.14.1) + activesupport (= 4.1.14.1) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.11) - activesupport (= 4.1.11) + activemodel (4.1.14.1) + activesupport (= 4.1.14.1) builder (~> 3.1) - activerecord (4.1.11) - activemodel (= 4.1.11) - activesupport (= 4.1.11) + activerecord (4.1.14.1) + activemodel (= 4.1.14.1) + activesupport (= 4.1.14.1) arel (~> 5.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.1.11) + activesupport (4.1.14.1) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -110,13 +110,13 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) metaclass (0.0.4) - mime-types (2.6.1) + mime-types (2.99) mimemagic (0.3.0) mini_portile2 (2.0.0) - minitest (5.7.0) + minitest (5.8.4) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.1) + multi_json (1.11.2) multi_test (0.1.1) mysql2 (0.3.20) nokogiri (1.6.7) @@ -136,24 +136,24 @@ GEM rack (>= 1.1.3) rack-test (0.6.3) rack (>= 1.0) - rails (4.1.11) - actionmailer (= 4.1.11) - actionpack (= 4.1.11) - actionview (= 4.1.11) - activemodel (= 4.1.11) - activerecord (= 4.1.11) - activesupport (= 4.1.11) + rails (4.1.14.1) + actionmailer (= 4.1.14.1) + actionpack (= 4.1.14.1) + actionview (= 4.1.14.1) + activemodel (= 4.1.14.1) + activerecord (= 4.1.14.1) + activesupport (= 4.1.14.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.11) + railties (= 4.1.14.1) sprockets-rails (~> 2.0) rails_autolink (1.1.6) rails (> 3.1) - railties (4.1.11) - actionpack (= 4.1.11) - activesupport (= 4.1.11) + railties (4.1.14.1) + actionpack (= 4.1.14.1) + activesupport (= 4.1.14.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) + rake (10.5.0) ref (1.0.5) rspec-expectations (3.1.2) diff-lcs (>= 1.2.0, < 2.0) @@ -189,7 +189,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.1) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -266,3 +266,6 @@ DEPENDENCIES uglifier (>= 1.3.0) will_paginate yard + +BUNDLED WITH + 1.10.6