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

Fixed up some deprication warnings.

This commit is contained in:
Mario Visic 2012-04-02 21:56:00 +08:00
parent 29e40b39ea
commit ea62835b2e
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Gemfile.lock
View File

@ -33,6 +33,7 @@ PATH
actionmailer-with-request (~> 0.3.0) actionmailer-with-request (~> 0.3.0)
bson_ext (~> 1.5.2) bson_ext (~> 1.5.2)
cancan (~> 1.6.7) cancan (~> 1.6.7)
carrierwave (~> 0.6.0)
carrierwave-mongoid (~> 0.1.3) carrierwave-mongoid (~> 0.1.3)
cells (~> 3.8.0) cells (~> 3.8.0)
codemirror-rails (~> 2.21) codemirror-rails (~> 2.21)
@ -110,10 +111,11 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)
carrierwave (0.5.8) carrierwave (0.6.0)
activesupport (~> 3.0) activemodel (>= 3.2.0)
carrierwave-mongoid (0.1.4) activesupport (>= 3.2.0)
carrierwave (~> 0.5.6) carrierwave-mongoid (0.1.3)
carrierwave (>= 0.5.6)
mongoid (~> 2.1) mongoid (~> 2.1)
cells (3.8.3) cells (3.8.3)
actionpack (~> 3.0) actionpack (~> 3.0)

1
locomotive_cms.gemspec
View File

@ -52,6 +52,7 @@ Gem::Specification.new do |s|
s.add_dependency 'rmagick', '~> 2.12.2' s.add_dependency 'rmagick', '~> 2.12.2'
s.add_dependency 'carrierwave-mongoid', '~> 0.1.3' s.add_dependency 'carrierwave-mongoid', '~> 0.1.3'
s.add_dependency 'carrierwave', '~> 0.6.0'
s.add_dependency 'fog', '~> 1.1.2' s.add_dependency 'fog', '~> 1.1.2'
s.add_dependency 'dragonfly', '~> 0.9.8' s.add_dependency 'dragonfly', '~> 0.9.8'
s.add_dependency 'rack-cache', '~> 1.1' s.add_dependency 'rack-cache', '~> 1.1'

2
spec/models/locomotive/page_spec.rb
View File

@ -226,7 +226,7 @@ describe Locomotive::Page do
describe 'templatized extension' do describe 'templatized extension' do
before(:each) do before(:each) do
@page = FactoryGirl.build(:page, :parent => Factory.build(:page, :templatized => false), :templatized => true, :target_klass_name => 'Foo') @page = FactoryGirl.build(:page, :parent => FactoryGirl.build(:page, :templatized => false), :templatized => true, :target_klass_name => 'Foo')
end end
it 'is considered as a templatized page' do it 'is considered as a templatized page' do