Permalink
Browse files

go back to yajl since oj isn't compiling

  • Loading branch information...
1 parent 5229ba4 commit 1733fcd4817238ae535b15042980d7db7e96ef11 @qrush qrush committed Apr 13, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 Gemfile.lock
  3. BIN vendor/cache/oj-1.2.3.gem
  4. BIN vendor/cache/yajl-ruby-1.1.0.gem
View
@@ -13,7 +13,6 @@ gem 'high_voltage'
gem 'jquery-rails'
gem 'mail'
gem 'multi_json'
-gem 'oj'
gem 'paul_revere'
gem 'pg'
gem 'rack'
@@ -25,6 +24,7 @@ gem 'sinatra'
gem 'validates_formatting_of', '>= 0.3.0'
gem 'will_paginate'
gem 'xml-simple'
+gem 'yajl-ruby', :require => 'yajl'
# enable if on heroku, make sure to toss this into an initializer:
# Rails.application.config.middleware.use HerokuAssetCacher
View
@@ -140,7 +140,6 @@ GEM
redis (< 3.0)
newrelic_rpm (3.3.3)
nokogiri (1.5.2)
- oj (1.2.3)
paul_revere (0.2.1)
rails (~> 3.0)
pg (0.13.2)
@@ -227,6 +226,7 @@ GEM
xml-simple (1.1.1)
xpath (0.1.4)
nokogiri (~> 1.3)
+ yajl-ruby (1.1.0)
PLATFORMS
ruby
@@ -259,7 +259,6 @@ DEPENDENCIES
newrelic-redis
newrelic_rpm
nokogiri
- oj
paul_revere
pg
pry
@@ -280,3 +279,4 @@ DEPENDENCIES
webmock
will_paginate
xml-simple
+ yajl-ruby
Binary file not shown.
Binary file not shown.

0 comments on commit 1733fcd

Please sign in to comment.