Skip to content

Commit 3865fc5

Browse files
authored
Merge pull request #69 from zorab47/update-dependencies
Update dependencies to restrict to ActiveAdmin `< 1.1.0`
2 parents c174751 + e2e5e6e commit 3865fc5

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

Changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.1.0] - 2017-10-17
6+
7+
### Changed
8+
9+
- Update dependencies to only support ActiveAdmin `< 1.1.0` because `v1.1.0`
10+
[dropped its dependency on `jquery-ui-rails`](https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md).
11+
512
## [1.0.0] - 2017-06-01
613

714
### Added
@@ -51,3 +58,4 @@ All notable changes to this project will be documented in this file.
5158
[0.2.1]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.0...v0.2.1
5259
[0.3.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.1...v0.3.0
5360
[1.0.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.3.0...v1.0.0
61+
[1.1.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v1.0.0...v1.1.0

active_admin-sortable_tree.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
1717
s.files = `git ls-files app lib vendor`.split($\) + ["Changelog.md", "README.md", "MIT-LICENSE"]
1818

1919
s.add_dependency 'rails', '>= 3.2'
20-
s.add_dependency 'activeadmin', '>= 0.6'
20+
s.add_dependency 'activeadmin', '>= 0.6', "< 1.1.0"
2121
s.add_dependency 'jquery-ui-rails', '>= 5.0'
2222

2323
s.add_development_dependency 'capybara'

gemfiles/4.2.gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ gem 'jquery-ui-rails'
33
gem 'ancestry'
44
gem 'sqlite3'
55

6-
# ActiveAdmin 1.0.0pre
7-
gem 'activeadmin', github: 'gregbell/active_admin'
6+
gem 'activeadmin'
87
gem 'devise'
98
gem 'rails', '~> 4.2.0'
109
gem 'sass-rails'

gemfiles/5.0.gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ gem 'jquery-ui-rails'
33
gem 'ancestry'
44
gem 'sqlite3'
55

6-
# ActiveAdmin 1.0.0pre
7-
gem 'activeadmin', github: 'gregbell/active_admin'
6+
gem 'activeadmin'
87
gem 'devise'
98
gem 'rails', '~> 5.0.0'
109
gem 'sass-rails'

gemfiles/5.1.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
gem 'puma'
12
gem 'jquery-rails'
23
gem 'jquery-ui-rails'
34
gem 'ancestry'
45
gem 'sqlite3'
56

6-
# ActiveAdmin 1.0.0pre
7-
gem 'activeadmin', github: 'gregbell/active_admin'
7+
gem 'activeadmin'
88
gem 'devise'
99
gem 'rails', '~> 5.1.0'
1010
gem 'sass-rails'

0 commit comments

Comments
 (0)