Skip to content

Commit

Permalink
Updates/Checkes to kaminari.
Browse files Browse the repository at this point in the history
  • Loading branch information
TuckerJD committed Aug 11, 2017
1 parent a9c3bc0 commit 418ad49
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Expand Up @@ -81,11 +81,11 @@ gem 'pdf-reader', '~> 2.0'
gem 'chartkick', '~> 2.2', '>= 2.2.4'
# gem 'groupdate', '~> 3.1.1'
gem 'groupdate', '~> 3.2'
# R5.0
# gem 'dropzonejs-rails', '~> 0.7.3'
gem 'dropzonejs-rails', '~> 0.8.1'
gem 'kaminari', '~> 0.17.0'
# gem 'kaminari', '~> 1.0', '>= 1.0.1'
# R5.0
# gem 'kaminari', '~> 0.17.0'
gem 'kaminari', '~> 1.0', '>= 1.0.1'
gem 'best_in_place', '~> 3.1.1'
gem 'sass-rails', '~> 5.0.6'
gem 'redcarpet', '~> 3.3'
Expand Down
17 changes: 13 additions & 4 deletions Gemfile.lock
Expand Up @@ -211,9 +211,18 @@ GEM
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (1.8.6)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kaminari (1.0.1)
activesupport (>= 4.1.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)
latex-decode (0.2.2)
unicode (~> 0.4)
listen (3.1.5)
Expand Down Expand Up @@ -533,7 +542,7 @@ DEPENDENCIES
jquery-rails (~> 4.3, >= 4.3.1)
jquery-turbolinks (~> 2.1)
jquery-ui-rails (~> 6.0, >= 6.0.1)
kaminari (~> 0.17.0)
kaminari (~> 1.0, >= 1.0.1)
latex-decode (~> 0.2.2)
mail (~> 2.7.0.rc1)
modularity (~> 2.0.1)
Expand Down

0 comments on commit 418ad49

Please sign in to comment.