Skip to content

Commit 5dc0b08

Browse files
authored
Merge pull request #13 from tf/aa-2
Add support for Active Admin 2.0
2 parents 0dd83e0 + 1635a80 commit 5dc0b08

File tree

6 files changed

+20
-3
lines changed

6 files changed

+20
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ gemfile:
1212
- gemfiles/rails_4.2_active_admin_1.0.0.pre4.gemfile
1313
- gemfiles/rails_5.1_active_admin_1.x.gemfile
1414
- gemfiles/rails_5.x_active_admin_1.x.gemfile
15+
- gemfiles/rails_5.x_active_admin_2.x.gemfile
1516

1617
script: bundle exec rspec

Appraisals

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ appraise 'rails-4.2-active-admin-1.0.0.pre4' do
22
gem 'rails', '~> 4.2'
33
gem 'activeadmin', '1.0.0.pre4'
44
gem 'jquery-ui-rails', '~> 5.0'
5+
gem 'sqlite3', '~> 1.3.6'
56
end
67

78
appraise 'rails-5.1-active-admin-1.x' do
@@ -13,3 +14,8 @@ appraise 'rails-5.x-active-admin-1.x' do
1314
gem 'rails', '~> 5.2'
1415
gem 'activeadmin', '~> 1.0'
1516
end
17+
18+
appraise 'rails-5.x-active-admin-2.x' do
19+
gem 'rails', '~> 5.2'
20+
gem 'activeadmin', '~> 2.0'
21+
end

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Import stylesheets and require javascripts:
2323
```
2424
2525
```coffee
26-
# active_admin.js.coffee
27-
#= require active_admin/searchable_select
26+
// active_admin.js
27+
//= require active_admin/searchable_select
2828
```
2929
3030
## Usage

activeadmin-searchable_select.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
2929
spec.add_development_dependency 'semmy', '~> 1.0'
3030
spec.add_development_dependency 'rails'
3131

32-
spec.add_runtime_dependency 'activeadmin', '~> 1.x'
32+
spec.add_runtime_dependency 'activeadmin', ['>= 1.x', '< 3']
3333
spec.add_runtime_dependency 'jquery-rails', ['>= 3.0', '< 5']
3434
spec.add_runtime_dependency 'select2-rails', '~> 4.0'
3535
end

gemfiles/rails_4.2_active_admin_1.0.0.pre4.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ gem "sass-rails"
66
gem "rails", "~> 4.2"
77
gem "activeadmin", "1.0.0.pre4"
88
gem "jquery-ui-rails", "~> 5.0"
9+
gem "sqlite3", "~> 1.3.6"
910

1011
gemspec path: "../"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "sass-rails"
6+
gem "rails", "~> 5.2"
7+
gem "activeadmin", "~> 2.0"
8+
9+
gemspec path: "../"

0 commit comments

Comments
 (0)