Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

update kaminari #657

Merged
merged 1 commit into from
Jul 10, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ gem 'jquery-ui-rails'
gem 'jquery-datatables-rails'
gem 'rails3-jquery-autocomplete'
gem 'select2-rails'
gem 'kaminari'
gem 'kaminari', '~> 0.16.1'
gem 'spinjs-rails'

#forms / formatting
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -162,7 +162,7 @@ GEM
highline (1.6.19)
hike (1.2.3)
http_parser.rb (0.5.3)
i18n (0.6.9)
i18n (0.6.11)
inherited_resources (1.5.0)
has_scope (~> 0.6.0.rc)
responders (~> 1.0)
@@ -176,7 +176,7 @@ GEM
railties (>= 3.1.0)
jquery_datepicker (0.4)
json (1.8.1)
kaminari (0.14.1)
kaminari (0.16.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
launchy (2.3.0)
@@ -395,7 +395,7 @@ DEPENDENCIES
jquery-rails
jquery-ui-rails
jquery_datepicker
kaminari
kaminari (~> 0.16.1)
letter_opener
letter_opener_web (~> 1.1.0)
mysql2 (= 0.3.16)