Download as
Browse Code »

Commit 7bd1fbe7c8d44378f6399c3f249fce190a73c81a

Authored by grosser
1 parent d36bdf03
Exists in master and in 1 other branch production

update and fix will_paginate

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