Commit 6745812c7236e8d4f463e226feb2e61389c85563
1 parent
cc03600b
Exists in
master
and in
4 other branches
bump kaminari
Showing
1 changed file
with
4 additions
and
5 deletions
Show diff stats
Gemfile.lock
@@ -198,7 +198,7 @@ GEM | @@ -198,7 +198,7 @@ GEM | ||
198 | httparty (0.8.3) | 198 | httparty (0.8.3) |
199 | multi_json (~> 1.0) | 199 | multi_json (~> 1.0) |
200 | multi_xml | 200 | multi_xml |
201 | - i18n (0.6.0) | 201 | + i18n (0.6.1) |
202 | journey (1.0.4) | 202 | journey (1.0.4) |
203 | jquery-rails (2.0.2) | 203 | jquery-rails (2.0.2) |
204 | railties (>= 3.2.0, < 5.0) | 204 | railties (>= 3.2.0, < 5.0) |
@@ -206,11 +206,10 @@ GEM | @@ -206,11 +206,10 @@ GEM | ||
206 | jquery-ui-rails (0.5.0) | 206 | jquery-ui-rails (0.5.0) |
207 | jquery-rails | 207 | jquery-rails |
208 | railties (>= 3.1.0) | 208 | railties (>= 3.1.0) |
209 | - json (1.7.4) | ||
210 | - kaminari (0.13.0) | 209 | + json (1.7.5) |
210 | + kaminari (0.14.0) | ||
211 | actionpack (>= 3.0.0) | 211 | actionpack (>= 3.0.0) |
212 | activesupport (>= 3.0.0) | 212 | activesupport (>= 3.0.0) |
213 | - railties (>= 3.0.0) | ||
214 | kgio (2.7.4) | 213 | kgio (2.7.4) |
215 | launchy (2.1.0) | 214 | launchy (2.1.0) |
216 | addressable (~> 2.2.6) | 215 | addressable (~> 2.2.6) |
@@ -348,7 +347,7 @@ GEM | @@ -348,7 +347,7 @@ GEM | ||
348 | daemons (>= 1.0.9) | 347 | daemons (>= 1.0.9) |
349 | eventmachine (>= 0.12.6) | 348 | eventmachine (>= 0.12.6) |
350 | rack (>= 1.0.0) | 349 | rack (>= 1.0.0) |
351 | - thor (0.15.4) | 350 | + thor (0.16.0) |
352 | tilt (1.3.3) | 351 | tilt (1.3.3) |
353 | treetop (1.4.10) | 352 | treetop (1.4.10) |
354 | polyglot | 353 | polyglot |