From 0f244bf50fb783e6c2101bcd2509a3e1f943a37b Mon Sep 17 00:00:00 2001
From: rbreu <rebecca@rbreu.de>
Date: Wed, 6 Oct 2010 19:44:49 +0000
Subject: [PATCH] Using will_paginate from trunk. This fixes a problem with
 duplicated content on some paginated pages. Run bundle install.

---
 Gemfile      |  9 ++++++++-
 Gemfile.lock | 14 ++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 173251662f2..5bed4516aef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
@@ -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',
diff --git a/Gemfile.lock b/Gemfile.lock
index 3afec718eb5..deb00ef6ca5 100644
--- a/Gemfile.lock
+++ b/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
@@ -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:
@@ -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)
@@ -246,4 +252,4 @@ DEPENDENCIES
   tolk!
   ts-delayed-delta
   whenever
-  will_paginate (= 3.0.pre)
+  will_paginate!