From 3f01ada1b7014795bdb0bd4fc56f808c4f490126 Mon Sep 17 00:00:00 2001 From: Charles Maresh Date: Tue, 17 Oct 2017 15:55:44 -0500 Subject: [PATCH 1/4] Restrict to ActiveAdmin less than v1.1.0 --- active_admin-sortable_tree.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/active_admin-sortable_tree.gemspec b/active_admin-sortable_tree.gemspec index 4f6d326..996fcd1 100644 --- a/active_admin-sortable_tree.gemspec +++ b/active_admin-sortable_tree.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.files = `git ls-files app lib vendor`.split($\) + ["Changelog.md", "README.md", "MIT-LICENSE"] s.add_dependency 'rails', '>= 3.2' - s.add_dependency 'activeadmin', '>= 0.6' + s.add_dependency 'activeadmin', '>= 0.6', "< 1.1.0" s.add_dependency 'jquery-ui-rails', '>= 5.0' s.add_development_dependency 'capybara' From a43b17595868128819c2bfa10aa786c149bd3e56 Mon Sep 17 00:00:00 2001 From: Charles Maresh Date: Tue, 17 Oct 2017 15:55:58 -0500 Subject: [PATCH 2/4] Update change log for v1.1.0 --- Changelog.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Changelog.md b/Changelog.md index 9ec3a76..db8fa11 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +## [1.1.0] - 2017-10-17 + +### Changed + +- Update dependencies to only support ActiveAdmin `< 1.1.0` because `v1.1.0` + [dropped its dependency on `jquery-ui-rails`](https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md). + ## [1.0.0] - 2017-06-01 ### Added @@ -51,3 +58,4 @@ All notable changes to this project will be documented in this file. [0.2.1]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.0...v0.2.1 [0.3.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.1...v0.3.0 [1.0.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.3.0...v1.0.0 +[1.1.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v1.0.0...v1.1.0 From 321f111a28e69a57afbcf4e934febb5794cd05f0 Mon Sep 17 00:00:00 2001 From: Charles Maresh Date: Tue, 17 Oct 2017 15:58:49 -0500 Subject: [PATCH 3/4] Update gemfiles removing use of github repo for activeadmin --- gemfiles/4.2.gemfile | 3 +-- gemfiles/5.0.gemfile | 3 +-- gemfiles/5.1.gemfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile index de359a0..2ca256f 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/4.2.gemfile @@ -3,8 +3,7 @@ gem 'jquery-ui-rails' gem 'ancestry' gem 'sqlite3' -# ActiveAdmin 1.0.0pre -gem 'activeadmin', github: 'gregbell/active_admin' +gem 'activeadmin' gem 'devise' gem 'rails', '~> 4.2.0' gem 'sass-rails' diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile index 9d293a1..564e8fc 100644 --- a/gemfiles/5.0.gemfile +++ b/gemfiles/5.0.gemfile @@ -3,8 +3,7 @@ gem 'jquery-ui-rails' gem 'ancestry' gem 'sqlite3' -# ActiveAdmin 1.0.0pre -gem 'activeadmin', github: 'gregbell/active_admin' +gem 'activeadmin' gem 'devise' gem 'rails', '~> 5.0.0' gem 'sass-rails' diff --git a/gemfiles/5.1.gemfile b/gemfiles/5.1.gemfile index 430c065..0d9517b 100644 --- a/gemfiles/5.1.gemfile +++ b/gemfiles/5.1.gemfile @@ -3,8 +3,7 @@ gem 'jquery-ui-rails' gem 'ancestry' gem 'sqlite3' -# ActiveAdmin 1.0.0pre -gem 'activeadmin', github: 'gregbell/active_admin' +gem 'activeadmin' gem 'devise' gem 'rails', '~> 5.1.0' gem 'sass-rails' From e2e5e6e71ef21d39d25bb0a5d7875226bdd34227 Mon Sep 17 00:00:00 2001 From: Charles Maresh Date: Mon, 23 Oct 2017 21:46:33 -0500 Subject: [PATCH 4/4] Specify puma for Rails 5.1 gemfile --- gemfiles/5.1.gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/gemfiles/5.1.gemfile b/gemfiles/5.1.gemfile index 0d9517b..5216d25 100644 --- a/gemfiles/5.1.gemfile +++ b/gemfiles/5.1.gemfile @@ -1,3 +1,4 @@ +gem 'puma' gem 'jquery-rails' gem 'jquery-ui-rails' gem 'ancestry'