Skip to content

Commit 5548cce

Browse files
author
Austin Schneider
committed
upgrade kaminari
1 parent 0a5693c commit 5548cce

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem 'httparty', '0.8.1'
88
gem 'squeel', '0.9.3'
99
gem 'resque', '1.24.1'
1010
gem 'resque-scheduler', '2.0.1'
11-
gem 'kaminari', '0.12.4'
11+
gem 'kaminari', '0.14.1'
1212
# gem 'twitter', '2.0.1'
1313

1414
# Gems used only for assets and not required

Gemfile.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ GEM
9090
railties (~> 3.0)
9191
thor (~> 0.14)
9292
json (1.8.0)
93-
kaminari (0.12.4)
94-
rails (>= 3.0.0)
93+
kaminari (0.14.1)
94+
actionpack (>= 3.0.0)
95+
activesupport (>= 3.0.0)
9596
launchy (2.0.5)
9697
addressable (~> 2.2.6)
9798
mail (2.5.4)
@@ -220,7 +221,7 @@ DEPENDENCIES
220221
haml-rails (= 0.3.5)
221222
httparty (= 0.8.1)
222223
jquery-rails (= 1.0.16)
223-
kaminari (= 0.12.4)
224+
kaminari (= 0.14.1)
224225
launchy (~> 2.0.5)
225226
pg (= 0.11.0)
226227
rails (= 3.2.14)

0 commit comments

Comments
 (0)