From 7bd1fbe7c8d44378f6399c3f249fce190a73c81a Mon Sep 17 00:00:00 2001 From: grosser Date: Fri, 19 Aug 2011 11:38:13 +0200 Subject: [PATCH] update and fix will_paginate --- Gemfile | 2 +- Gemfile.lock | 4 ++-- config/application.rb | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 975dea7..b90f5e3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '3.0.5' gem 'nokogiri' gem 'mongoid', '2.1.2' gem 'haml' -gem 'will_paginate' +gem 'will_paginate', '>=3' gem 'devise', '~> 1.4.0' gem 'lighthouse-api' gem 'redmine_client', :git => "git://github.com/oruen/redmine_client.git" diff --git a/Gemfile.lock b/Gemfile.lock index 9b14eae..2fbda4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM webmock (1.6.2) addressable (>= 2.2.2) crack (>= 0.1.7) - will_paginate (3.0.pre2) + will_paginate (3.0.0) PLATFORMS ruby @@ -223,4 +223,4 @@ DEPENDENCIES thin useragent (~> 0.3.1) webmock - will_paginate + will_paginate (>= 3) diff --git a/config/application.rb b/config/application.rb index 2b1945c..bdf0f12 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,6 +7,8 @@ require "action_controller/railtie" require "action_mailer/railtie" # require "active_resource/railtie" require 'mongoid/railtie' +require 'will_paginate/array' # make paginate available on Array + # If you have a Gemfile, require the gems listed there, including any gems # you've limited to :test, :development, or :production. -- libgit2 0.21.2