Commit 7e223c81136013b599f8ac9078d88bdf3607e35c

Authored by Nathan B
2 parents d36bdf03 7bd1fbe7
Exists in master and in 1 other branch production

Merge pull request #67 from dawanda/fix-will_paginate

Update and fix will_paginate for 3.0 release
Showing 3 changed files with 5 additions and 3 deletions   Show diff stats
Gemfile
... ... @@ -4,7 +4,7 @@ gem 'rails', '3.0.5'
4 4 gem 'nokogiri'
5 5 gem 'mongoid', '2.1.2'
6 6 gem 'haml'
7   -gem 'will_paginate'
  7 +gem 'will_paginate', '>=3'
8 8 gem 'devise', '~> 1.4.0'
9 9 gem 'lighthouse-api'
10 10 gem 'redmine_client', :git => "git://github.com/oruen/redmine_client.git"
... ...
Gemfile.lock
... ... @@ -193,7 +193,7 @@ GEM
193 193 webmock (1.6.2)
194 194 addressable (>= 2.2.2)
195 195 crack (>= 0.1.7)
196   - will_paginate (3.0.pre2)
  196 + will_paginate (3.0.0)
197 197  
198 198 PLATFORMS
199 199 ruby
... ... @@ -223,4 +223,4 @@ DEPENDENCIES
223 223 thin
224 224 useragent (~> 0.3.1)
225 225 webmock
226   - will_paginate
  226 + will_paginate (>= 3)
... ...
config/application.rb
... ... @@ -7,6 +7,8 @@ require "action_controller/railtie"
7 7 require "action_mailer/railtie"
8 8 # require "active_resource/railtie"
9 9 require 'mongoid/railtie'
  10 +require 'will_paginate/array' # make paginate available on Array
  11 +
10 12  
11 13 # If you have a Gemfile, require the gems listed there, including any gems
12 14 # you've limited to :test, :development, or :production.
... ...