diff --git a/Gemfile b/Gemfile index dc2c8a7e..116f5e44 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'delayed_job_mongoid', '1.0.6' gem 'rubyzip' gem 'locomotive_jammit-s3', :require => 'jammit-s3' gem 'SystemTimer', :platforms => :ruby_18 -gem 'cells', '3.6.6' +gem 'cells' gem 'sanitize' gem 'highline' diff --git a/config/boot.rb b/config/boot.rb index 92b23701..bbd37771 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,8 +1,8 @@ require 'rubygems' # Need to explicitly use syck for yaml -#require 'yaml' -#YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE) +require 'yaml' +YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE) # Set up gems listed in the Gemfile. if File.exist?(File.expand_path('../../Gemfile', __FILE__)) diff --git a/lib/locomotive/import/job.rb b/lib/locomotive/import/job.rb index 227e6a7b..62f1ab61 100644 --- a/lib/locomotive/import/job.rb +++ b/lib/locomotive/import/job.rb @@ -176,4 +176,4 @@ module Locomotive end end -end +end \ No newline at end of file diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index 5d217f97..d90e4f4f 100644 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |s| s.add_dependency 'locomotive_liquid', '2.2.2' s.add_dependency 'formtastic', '~> 1.2.3' s.add_dependency 'inherited_resources', '~> 1.1.2' - s.add_dependency 'cells', '3.6.6' + s.add_dependency 'cells' s.add_dependency 'highline' s.add_dependency 'sanitize'