From ebf183c6f6157a413c01d654dda78cb4c4df3059 Mon Sep 17 00:00:00 2001
From: did <didier@nocoffee.fr>
Date: Thu, 10 Mar 2011 09:32:34 +0100
Subject: [PATCH] back to heroku 1.18.2

---
 Gemfile                  | 2 +-
 lib/locomotive/engine.rb | 2 +-
 locomotive_cms.gemspec   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7ed7c3aa..b1fa2d95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem 'custom_fields', '1.0.0.beta.6'
 gem 'fog', '0.3.7'
 gem 'mimetype-fu'
 gem 'actionmailer-with-request'
-gem 'heroku', '1.18.3'
+gem 'heroku', '1.18.2'
 gem 'httparty', '>= 0.6.1'
 gem 'RedCloth', '4.2.7'
 gem 'delayed_job', '2.1.4'
diff --git a/lib/locomotive/engine.rb b/lib/locomotive/engine.rb
index a8cbe98c..2d3a7c6b 100644
--- a/lib/locomotive/engine.rb
+++ b/lib/locomotive/engine.rb
@@ -1,7 +1,7 @@
 puts "...loading Locomotive engine"
 
 require 'rails'
-# require 'json/pure'
+require 'json/pure'
 require 'devise'
 require 'mongoid'
 require 'mongoid_acts_as_tree'
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index e2f39e60..8ad703d7 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency "fog", "0.3.7"
   s.add_dependency "mimetype-fu"
   s.add_dependency "actionmailer-with-request"
-  s.add_dependency "heroku", "1.18.3"
+  s.add_dependency "heroku", "1.18.2"
   s.add_dependency "httparty", ">= 0.6.1"
   s.add_dependency "RedCloth", "4.2.7"
   s.add_dependency "delayed_job", "2.1.4"