diff --git a/Gemfile b/Gemfile index b744ba1..65ff4f2 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source :rubygems group :development do gem "RedCloth", "~> 4.2" gem "foreman", "~> 0.13" - gem "serve", "~> 1.0" + gem "serve", "~> 1.5", ">= 1.5.0" gem "jekyll", "~> 0.10" - gem "thin", "~> 1.2" + gem "thin", "~> 1.2", ">= 1.2.11" end diff --git a/Gemfile.lock b/Gemfile.lock index 8b54f2a..20fb187 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,17 +2,21 @@ GEM remote: http://rubygems.org/ specs: RedCloth (4.2.7) - activesupport (3.0.7) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) classifier (1.3.3) fast-stemmer (>= 1.0.0) - daemons (1.1.3) + concurrent-ruby (1.1.5) + daemons (1.3.1) directory_watcher (1.4.0) - eventmachine (0.12.10) + eventmachine (1.2.7) fast-stemmer (1.0.0) foreman (0.13.0) term-ansicolor (~> 1.0.5) thor (>= 0.13.6) - i18n (0.4.2) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jekyll (0.10.0) classifier (>= 1.3.1) directory_watcher (>= 1.1.1) @@ -21,20 +25,27 @@ GEM liquid (2.2.2) maruku (0.6.0) syntax (>= 1.0.0) - rack (1.2.2) - serve (1.0.0) - activesupport (~> 3.0.1) - i18n (~> 0.4.1) - rack (~> 1.2.1) - tzinfo (~> 0.3.23) + multi_json (1.14.1) + rack (1.5.5) + rack-test (0.6.3) + rack (>= 1.0) + serve (1.5.2) + activesupport (~> 3.2.12) + i18n + rack (~> 1.5.2) + rack-test (~> 0.6.2) + tilt (~> 1.3.3) + tzinfo syntax (1.0.0) term-ansicolor (1.0.5) - thin (1.2.11) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) + thin (1.7.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) thor (0.14.6) - tzinfo (0.3.27) + tilt (1.3.7) + tzinfo (2.0.1) + concurrent-ruby (~> 1.0) PLATFORMS ruby @@ -43,5 +54,8 @@ DEPENDENCIES RedCloth (~> 4.2) foreman (~> 0.13) jekyll (~> 0.10) - serve (~> 1.0) - thin (~> 1.2) + serve (~> 1.5, >= 1.5.0) + thin (~> 1.2, >= 1.2.11) + +BUNDLED WITH + 1.17.3