Merge remote-tracking branch 'upstream/master' into current_user_liquid_extensions

Gemfile

@@ -40,7 +40,7 @@ gem 'delayed_job_mongoid', '1.0.8'
 gem 'rubyzip'
 gem 'locomotive_jammit-s3', :require => 'jammit-s3'
 gem 'SystemTimer', :platforms => :ruby_18
-gem 'cells'
+gem 'cells', '3.8.0'
 gem 'sanitize'
 gem 'highline'
 

Gemfile.lock

@@ -294,7 +294,7 @@ DEPENDENCIES
   cancan
   capybara
   carrierwave (= 0.5.6)
-  cells
+  cells (= 3.8.0)
   cucumber-rails (= 1.2.0)
   custom_fields (= 1.0.0.beta.25)
   database_cleaner

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'
+  s.add_dependency 'cells', '3.8.0'
   s.add_dependency 'highline'
   s.add_dependency 'sanitize'