Download as
Browse Code »

Commit 74187621ea0297103bd00d1e98c7e01692f64271

Authored by Dmitriy Zaporozhets
1 parent 01b98970
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Update kaminari 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
Gemfile
  Diff comments   View file @7418762
... ... @@ -63,7 +63,7 @@ gem &quot;stamp&quot;
63 63 gem 'enumerize'
64 64  
65 65 # Pagination
66   -gem "kaminari", "~> 0.14.1"
  66 +gem "kaminari", "~> 0.15.1"
67 67  
68 68 # HAML
69 69 gem "haml-rails"
... ...
Gemfile.lock
  Diff comments   View file @7418762
... ... @@ -259,7 +259,7 @@ GEM
259 259 json (1.8.1)
260 260 jwt (0.1.8)
261 261 multi_json (>= 1.5)
262   - kaminari (0.14.1)
  262 + kaminari (0.15.1)
263 263 actionpack (>= 3.0.0)
264 264 activesupport (>= 3.0.0)
265 265 kgio (2.8.1)
... ... @@ -281,7 +281,7 @@ GEM
281 281 minitest (4.7.5)
282 282 modernizr (2.6.2)
283 283 sprockets (~> 2.0)
284   - multi_json (1.8.2)
  284 + multi_json (1.8.4)
285 285 multi_xml (0.5.5)
286 286 multipart-post (1.2.0)
287 287 mysql2 (0.3.11)
... ... @@ -600,7 +600,7 @@ DEPENDENCIES
600 600 jquery-rails (= 2.1.3)
601 601 jquery-turbolinks
602 602 jquery-ui-rails (= 2.0.2)
603   - kaminari (~> 0.14.1)
  603 + kaminari (~> 0.15.1)
604 604 launchy
605 605 letter_opener
606 606 minitest (~> 4.7.0)
... ...