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

upgrade to will_paginate 3.0 (issue #166)

Browse Source
This commit is contained in:
did 2011-08-15 15:32:21 -07:00
parent 2d4f3df106
commit b3a8916565
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -13,7 +13,7 @@ gem 'devise_bushido_authenticatable', '1.0.0.alpha10', :require => 'devise_cas_a
gem 'mongoid', '~> 2.0.2' gem 'mongoid', '~> 2.0.2'
gem 'bson_ext', '~> 1.3.0' gem 'bson_ext', '~> 1.3.0'
gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree' gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree'
gem 'will_paginate' gem 'will_paginate', '~> 3.0.0'
gem 'haml', '3.1.2' gem 'haml', '3.1.2'
gem 'sass', '3.1.2' gem 'sass', '3.1.2'

4
Gemfile.lock
View File

@ -273,7 +273,7 @@ GEM
raindrops (~> 0.6) raindrops (~> 0.6)
warden (1.0.4) warden (1.0.4)
rack (>= 1.0) rack (>= 1.0)
will_paginate (2.3.15) will_paginate (3.0.0)
xpath (0.1.4) xpath (0.1.4)
nokogiri (~> 1.3) nokogiri (~> 1.3)
yui-compressor (0.9.6) yui-compressor (0.9.6)
@ -334,5 +334,5 @@ DEPENDENCIES
spork (~> 0.9.0.rc) spork (~> 0.9.0.rc)
unicorn unicorn
warden warden
will_paginate will_paginate (~> 3.0.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)

1
config/initializers/will_paginate.rb Normal file
View File

@ -0,0 +1 @@
require 'will_paginate/array'

2
locomotive_cms.gemspec
View File

@ -24,7 +24,7 @@ Gem::Specification.new do |s|
s.add_dependency 'mongoid', '2.0.2' s.add_dependency 'mongoid', '2.0.2'
s.add_dependency 'bson_ext', '~> 1.3.0' s.add_dependency 'bson_ext', '~> 1.3.0'
s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.7' s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.7'
s.add_dependency 'will_paginate' s.add_dependency 'will_paginate', '~> 3.0.0'
s.add_dependency 'haml', '3.1.2' s.add_dependency 'haml', '3.1.2'
s.add_dependency 'sass', '3.1.2' s.add_dependency 'sass', '3.1.2'