diff --git a/Gemfile b/Gemfile index b1fa2d95..bb72bed3 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,8 @@ gem 'custom_fields', '1.0.0.beta.6' gem 'fog', '0.3.7' gem 'mimetype-fu' gem 'actionmailer-with-request' -gem 'heroku', '1.18.2' +gem 'json' +gem 'heroku', '1.18.3' 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 f3254a3f..a8cbe98c 100644 --- a/lib/locomotive/engine.rb +++ b/lib/locomotive/engine.rb @@ -1,6 +1,7 @@ puts "...loading Locomotive engine" require 'rails' +# require 'json/pure' require 'devise' require 'mongoid' require 'mongoid_acts_as_tree' diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index 54a1bb21..e2f39e60 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" + s.add_dependency "heroku", "1.18.3" s.add_dependency "httparty", ">= 0.6.1" s.add_dependency "RedCloth", "4.2.7" s.add_dependency "delayed_job", "2.1.4"