From 34f9755d9accbfae0f4852f986f20e7c8eb4bb91 Mon Sep 17 00:00:00 2001
From: Mario Visic <mario@mariovisic.com>
Date: Sat, 21 Jan 2012 15:10:58 +1100
Subject: [PATCH] Altered admin menu cells inheritence, fixes #257 without
 limiting cells version.

---
 Gemfile                      | 2 +-
 Gemfile.lock                 | 6 +++---
 app/cells/admin/menu_cell.rb | 2 +-
 locomotive_cms.gemspec       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index cb7c8a3b..c92708b7 100644
--- a/Gemfile
+++ b/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', '~> 3.7.0'
+gem 'cells'
 gem 'sanitize'
 gem 'highline'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b2ad00f..45daad4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -62,7 +62,7 @@ GEM
       xpath (~> 0.1.4)
     carrierwave (0.5.6)
       activesupport (~> 3.0)
-    cells (3.7.1)
+    cells (3.8.0)
       actionpack (~> 3.0)
       railties (~> 3.0)
     childprocess (0.2.5)
@@ -141,7 +141,7 @@ GEM
       responders (~> 0.6.0)
     jammit (0.6.5)
       yui-compressor (>= 0.9.3)
-    json (1.6.4)
+    json (1.6.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -293,7 +293,7 @@ DEPENDENCIES
   cancan
   capybara
   carrierwave (= 0.5.6)
-  cells (~> 3.7.0)
+  cells
   cucumber-rails (= 1.2.0)
   custom_fields (= 1.0.0.beta.25)
   database_cleaner
diff --git a/app/cells/admin/menu_cell.rb b/app/cells/admin/menu_cell.rb
index 1d6c920b..573b37bf 100644
--- a/app/cells/admin/menu_cell.rb
+++ b/app/cells/admin/menu_cell.rb
@@ -1,4 +1,4 @@
-class Admin::MenuCell < Cell::Base
+class Admin::MenuCell < Cell::Rails
 
   include ::Rails.application.routes.url_helpers
 
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 8fbef388..8af17b35 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.7.0'
+  s.add_dependency 'cells'
   s.add_dependency 'highline'
   s.add_dependency 'sanitize'