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

Altered admin menu cells inheritence, fixes #257 without limiting cells version.

Browse Source
This commit is contained in:
Mario Visic 2012-01-21 15:10:58 +11:00
parent c2779dde51
commit 34f9755d9a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -40,7 +40,7 @@ gem 'delayed_job_mongoid', '1.0.8'
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.7.0' gem 'cells'
gem 'sanitize' gem 'sanitize'
gem 'highline' gem 'highline'

6
Gemfile.lock
View File

@ -62,7 +62,7 @@ GEM
xpath (~> 0.1.4) xpath (~> 0.1.4)
carrierwave (0.5.6) carrierwave (0.5.6)
activesupport (~> 3.0) activesupport (~> 3.0)
cells (3.7.1) cells (3.8.0)
actionpack (~> 3.0) actionpack (~> 3.0)
railties (~> 3.0) railties (~> 3.0)
childprocess (0.2.5) childprocess (0.2.5)
@ -141,7 +141,7 @@ GEM
responders (~> 0.6.0) responders (~> 0.6.0)
jammit (0.6.5) jammit (0.6.5)
yui-compressor (>= 0.9.3) yui-compressor (>= 0.9.3)
json (1.6.4) json (1.6.5)
kaminari (0.13.0) kaminari (0.13.0)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@ -293,7 +293,7 @@ DEPENDENCIES
cancan cancan
capybara capybara
carrierwave (= 0.5.6) carrierwave (= 0.5.6)
cells (~> 3.7.0) cells
cucumber-rails (= 1.2.0) cucumber-rails (= 1.2.0)
custom_fields (= 1.0.0.beta.25) custom_fields (= 1.0.0.beta.25)
database_cleaner database_cleaner

2
app/cells/admin/menu_cell.rb
View File

@ -1,4 +1,4 @@
class Admin::MenuCell < Cell::Base class Admin::MenuCell < Cell::Rails
include ::Rails.application.routes.url_helpers include ::Rails.application.routes.url_helpers

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.7.0' s.add_dependency 'cells'
s.add_dependency 'highline' s.add_dependency 'highline'
s.add_dependency 'sanitize' s.add_dependency 'sanitize'