summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-10-07 15:46:06 -0700
committertyler-ball <tyleraball@gmail.com>2014-10-07 16:41:48 -0700
commitb92978dd22f734f33044ec62c605b6eedb43bb6e (patch)
tree51934530fdb3b03ecbfc184e5f52d6f81165c132
parentd358471be4f794df804d13439225baa3fb9dfeb8 (diff)
downloadchef-b92978dd22f734f33044ec62c605b6eedb43bb6e.tar.gz
Using my ffi-yajl branch where I fixed Objects that do not support to_json
-rw-r--r--Gemfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 1418235ebc..b298b396e0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,8 @@ source "https://rubygems.org"
gemspec :name => "chef"
gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
+# TODO remove this when next version of ffi-yajl is released including this change
+gem "ffi-yajl", :github => 'tyler-ball/ffi-yajl', :branch => 'tball/remove_to_json'
group(:docgen) do
gem "yard"