Merge branch 'yajl-ruby-2-4-patch'

* yajl-ruby-2-4-patch:
  Depend on my branch of yajl-ruby with Ruby 2.4 Integer fix
This commit is contained in:
Parker Moore 2017-03-31 00:58:12 -04:00
commit d925dbca30
No known key found for this signature in database
GPG Key ID: 193CDEBA72063C58
1 changed files with 2 additions and 2 deletions

View File

@ -3,8 +3,6 @@ gemspec :name => "jekyll"
gem "rake", "~> 12.0"
gem "pygments.rb", "~> 1.1"
# Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"
@ -77,6 +75,8 @@ group :jekyll_optional_dependencies do
platform :ruby, :mswin, :mingw, :x64_mingw do
gem "classifier-reborn", "~> 2.1.0"
gem "liquid-c", "~> 3.0"
gem "pygments.rb", "~> 0.6.0"
gem "yajl-ruby", git: "https://github.com/parkr/yajl-ruby", branch: "1.2.x-unify-fixnum-to-integer"
gem "rdiscount", "~> 2.0"
gem "redcarpet", "~> 3.2", ">= 3.2.3"
end