diff --git a/CHANGELOG.md b/CHANGELOG.md index 373bf883..5331916b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Unreleased +Features: + - Update ActiveAdmin to 2.6 [#246](https://github.com/platanus/potassium/pull/246) + +Fix: + - Correctly use cache for bundle dependencies in CircleCi build [#244](https://github.com/platanus/potassium/pull/244) + ## 5.2.3 Features: diff --git a/lib/potassium/recipes/admin.rb b/lib/potassium/recipes/admin.rb index 4da868fc..8e94f39f 100644 --- a/lib/potassium/recipes/admin.rb +++ b/lib/potassium/recipes/admin.rb @@ -32,7 +32,7 @@ def installed? private def add_active_admin - gather_gem 'activeadmin', '~> 1.3.0' + gather_gem 'activeadmin', '~> 2.6' gather_gem 'activeadmin_addons' gather_gem 'active_skin'