git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed pagination

Browse Source
This commit is contained in:
Yan
2017-06-14 20:01:34 +06:30
parent 0eb8ac7087
commit 5cfcc9ab6a
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@@ -61,8 +61,7 @@ gem 'sidekiq'
#gem 'nokogiri', '~> 1.6' #gem 'nokogiri', '~> 1.6'
# Pagination # Pagination
gem 'kaminari' gem 'kaminari', '~> 1.0.1'
# gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
# Datatable # Datatable
gem 'filterrific' gem 'filterrific'

17
Gemfile.lock
View File

@@ -89,9 +89,18 @@ GEM
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
kaminari (0.16.3) kaminari (1.0.1)
actionpack (>= 3.0.0) activesupport (>= 4.1.0)
activesupport (>= 3.0.0) kaminari-actionview (= 1.0.1)
kaminari-activerecord (= 1.0.1)
kaminari-core (= 1.0.1)
kaminari-actionview (1.0.1)
actionview
kaminari-core (= 1.0.1)
kaminari-activerecord (1.0.1)
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
listen (3.0.8) listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
@@ -247,7 +256,7 @@ DEPENDENCIES
jbuilder (~> 2.5) jbuilder (~> 2.5)
jquery-rails jquery-rails
jquery-ui-rails jquery-ui-rails
kaminari kaminari (~> 1.0.1)
listen (~> 3.0.5) listen (~> 3.0.5)
mysql2 (>= 0.3.18, < 0.5) mysql2 (>= 0.3.18, < 0.5)
pg pg