Skip to content

Commit

Permalink
update kaminari and active admin
Browse files Browse the repository at this point in the history
  • Loading branch information
mi-wood committed Nov 24, 2018
1 parent 20a033d commit 42cbd29
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ruby '2.3.7'

gem 'rails', '5.2.1'

gem 'activeadmin', '~> 1.3'
gem 'activeadmin', '~> 1.4.1'
gem 'bootsnap', require: false
gem 'bootstrap-sass'
gem 'bugsnag'
Expand All @@ -18,7 +18,7 @@ gem 'haml'
gem 'high_voltage', '~> 3.0.0'
gem 'http_accept_language'
gem 'jbuilder', '~> 2.5'
gem 'kaminari', '~> 0.17.0'
gem 'kaminari', '~> 1.1.1'
gem 'mail_form', '>= 1.7.0'
gem 'pg'
gem 'pg_search'
Expand Down
27 changes: 18 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activeadmin (1.3.1)
activeadmin (1.4.1)
arbre (>= 1.1.1)
coffee-rails
formtastic (~> 3.1)
Expand Down Expand Up @@ -98,7 +98,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.3)
countries (2.1.4)
i18n_data (~> 0.8.0)
money (~> 6.9)
Expand Down Expand Up @@ -169,7 +169,7 @@ GEM
hashie (3.6.0)
high_voltage (3.0.0)
http_accept_language (2.1.1)
i18n (1.1.0)
i18n (1.1.1)
concurrent-ruby (~> 1.0)
i18n-debug (1.1.1)
i18n (< 2)
Expand All @@ -187,9 +187,18 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kramdown (1.15.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down Expand Up @@ -276,7 +285,7 @@ GEM
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rakismet (1.5.4)
ransack (2.0.1)
ransack (2.1.0)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
Expand Down Expand Up @@ -373,7 +382,7 @@ PLATFORMS
ruby

DEPENDENCIES
activeadmin (~> 1.3)
activeadmin (~> 1.4.1)
better_errors (~> 2.4.0)
binding_of_caller
bootsnap
Expand All @@ -395,7 +404,7 @@ DEPENDENCIES
http_accept_language
i18n-debug
jbuilder (~> 2.5)
kaminari (~> 0.17.0)
kaminari (~> 1.1.1)
listen (>= 3.0.5, < 3.2)
mail_form (>= 1.7.0)
pg
Expand Down

0 comments on commit 42cbd29

Please sign in to comment.