From d247e40fa1e3708322bc6c0f4833b8e74110d2e6 Mon Sep 17 00:00:00 2001 From: Todd Hambley Date: Tue, 8 Oct 2019 16:18:34 -0400 Subject: [PATCH] prepare release --- CHANGELOG.md | 10 +++++++++- README.md | 18 ++++++++++++++++-- lib/active_admin/xls/version.rb | 2 +- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dda684..9a30584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## [Unreleased] +## 2.0.2 + +### Changed + +* Remove ActiveAdmin runtime dependency version limit '<2' [#16] by [@reaper][] + ## 2.0.1 ### Fixed @@ -61,7 +67,9 @@ [#8]: https://github.com/thambley/activeadmin-xls/issues/8 [#11]: https://github.com/thambley/activeadmin-xls/pull/11 [#13]: https://github.com/thambley/activeadmin-xls/issues/13 +[#16]: https://github.com/thambley/activeadmin-xls/pull/16 [@rewritten]: https://github.com/rewritten [@ejaypcanaria]: https://github.com/ejaypcanaria -[@cpunion]: https://github.com/cpunion \ No newline at end of file +[@cpunion]: https://github.com/cpunion +[@reaper]: https://github.com/reaper diff --git a/README.md b/README.md index 13ccb4e..fbb0412 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Add the following to your Gemfile. All resource index views will now include a l gem 'activeadmin-xls', '~>2.0.0' ``` -For Active Admin 1.0, you will also have to update config/initializers/active_admin.rb. Update the download\_links setting to include xls: +For Active Admin 1.0 and above, you will also have to update config/initializers/active_admin.rb. Update the download\_links setting to include xls: ```ruby config.download_links = %i[csv xml json xls] @@ -160,6 +160,20 @@ BUNDLE_GEMFILE=gemfiles/rails_52.gemfile bundle exec rake setup BUNDLE_GEMFILE=gemfiles/rails_52.gemfile bundle exec rake ``` +### Rails 6.0 + +```text +bundle install --gemfile=gemfiles/rails_60.gemfile +``` + +```text +BUNDLE_GEMFILE=gemfiles/rails_60.gemfile bundle exec rake setup +``` + +```text +BUNDLE_GEMFILE=gemfiles/rails_60.gemfile bundle exec rake +``` + [Active Admin]:https://www.activeadmin.info/ [activeadmin-axlsx]:https://github.com/randym/activeadmin-axlsx [to_xls]:https://github.com/splendeo/to_xls @@ -174,4 +188,4 @@ BUNDLE_GEMFILE=gemfiles/rails_52.gemfile bundle exec rake [codecov_badge]: https://codecov.io/gh/thambley/activeadmin-xls/branch/master/graph/badge.svg [codecov]: https://codecov.io/gh/thambley/activeadmin-xls [inch_badge]: http://inch-ci.org/github/thambley/activeadmin-xls.svg?branch=master -[inch]: http://inch-ci.org/github/thambley/activeadmin-xls \ No newline at end of file +[inch]: http://inch-ci.org/github/thambley/activeadmin-xls diff --git a/lib/active_admin/xls/version.rb b/lib/active_admin/xls/version.rb index b60c9f5..7be2fa3 100644 --- a/lib/active_admin/xls/version.rb +++ b/lib/active_admin/xls/version.rb @@ -1,6 +1,6 @@ module ActiveAdmin module Xls # ActiveAdmin XLS gem version - VERSION = '2.0.1'.freeze + VERSION = '2.0.2'.freeze end end