Skip to content

Commit

Permalink
Using will_paginate from trunk. This fixes a problem with duplicated …
Browse files Browse the repository at this point in the history
…content on some paginated pages. Run bundle install.
  • Loading branch information
rbreu committed Oct 6, 2010
1 parent 9fd7a59 commit 0f244bf
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
9 changes: 8 additions & 1 deletion Gemfile
Expand Up @@ -23,7 +23,13 @@ gem 'fastthread'
# Here are all our application-specific gems
gem 'ruby-openid', :require => 'openid'
gem 'chronic'
gem 'will_paginate', '3.0.pre'

#gem 'will_paginate', '3.0.pre'
gem 'will_paginate',
:git => 'http://github.com/mislav/will_paginate.git',
:branch => 'rails3',
:require => 'will_paginate'

gem 'andand'
gem 'htmlentities'
gem 'whenever', :require => false
Expand All @@ -39,6 +45,7 @@ gem 'aws-s3', :require => 'aws/s3'
gem 'mocha'
gem 'css_parser'
gem 'paperclip', :git => 'git://github.com/thoughtbot/paperclip.git', :require => 'paperclip'

gem 'tolk',
:git => 'git://github.com/10to1/tolk.git',
:branch => 'rails3',
Expand Down
14 changes: 10 additions & 4 deletions Gemfile.lock
@@ -1,10 +1,10 @@
GIT
remote: git://github.com/10to1/tolk.git
revision: 3dc56f82db77124c7a8c922049a2e6d960713b60
revision: 25c88e179e1e05c916e38913a1e74bc3fa9963cc
branch: rails3
specs:
tolk (1.0)
will_paginate (= 3.0.pre)
will_paginate (>= 3.0.pre)
ya2yaml (~> 0.26)

GIT
Expand All @@ -23,6 +23,13 @@ GIT
activerecord
activesupport

GIT
remote: http://github.com/mislav/will_paginate.git
revision: 36159385c8a5837fc63fe901ebe0a88205b5ce8d
branch: rails3
specs:
will_paginate (3.0.pre2)

GEM
remote: http://rubygems.org/
specs:
Expand Down Expand Up @@ -203,7 +210,6 @@ GEM
whenever (0.5.3)
aaronh-chronic (>= 0.3.9)
activesupport (>= 2.3.4)
will_paginate (3.0.pre)
xml-simple (1.0.12)
ya2yaml (0.30)
yard (0.6.1)
Expand Down Expand Up @@ -246,4 +252,4 @@ DEPENDENCIES
tolk!
ts-delayed-delta
whenever
will_paginate (= 3.0.pre)
will_paginate!

0 comments on commit 0f244bf

Please sign in to comment.