github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "update cells dependency"

Browse Source 
This reverts commit 9a28ecbd1e.
This commit is contained in:
Paul Sponagl 2012-01-04 17:53:58 +01:00
parent df10701746
commit 2fd7b47b61
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -41,7 +41,7 @@ gem 'delayed_job_mongoid', '1.0.6'
gem 'rubyzip' gem 'rubyzip'
gem 'locomotive_jammit-s3', :require => 'jammit-s3' gem 'locomotive_jammit-s3', :require => 'jammit-s3'
gem 'SystemTimer', :platforms => :ruby_18 gem 'SystemTimer', :platforms => :ruby_18
gem 'cells', '3.6.6' gem 'cells'
gem 'sanitize' gem 'sanitize'
gem 'highline' gem 'highline'

4
config/boot.rb
View File

@ -1,8 +1,8 @@
require 'rubygems' require 'rubygems'
# Need to explicitly use syck for yaml # Need to explicitly use syck for yaml
#require 'yaml' require 'yaml'
#YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE) YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE)
# Set up gems listed in the Gemfile. # Set up gems listed in the Gemfile.
if File.exist?(File.expand_path('../../Gemfile', __FILE__)) if File.exist?(File.expand_path('../../Gemfile', __FILE__))

2
lib/locomotive/import/job.rb
View File

@ -176,4 +176,4 @@ module Locomotive
end end
end end
end end

2
locomotive_cms.gemspec
View File

@ -35,7 +35,7 @@ Gem::Specification.new do |s|
s.add_dependency 'locomotive_liquid', '2.2.2' s.add_dependency 'locomotive_liquid', '2.2.2'
s.add_dependency 'formtastic', '~> 1.2.3' s.add_dependency 'formtastic', '~> 1.2.3'
s.add_dependency 'inherited_resources', '~> 1.1.2' 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 'highline'
s.add_dependency 'sanitize' s.add_dependency 'sanitize'