activeadmin-rb 1.4.0 → 1.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/.travis.yml +17 -12
- data/CHANGELOG.md +10 -1
- data/Gemfile +3 -11
- data/activeadmin-rb.gemspec +3 -2
- data/app/views/active_admin/devise/confirmations/new.html.erb +1 -1
- data/app/views/active_admin/devise/passwords/edit.html.erb +1 -1
- data/app/views/active_admin/devise/passwords/new.html.erb +1 -1
- data/app/views/active_admin/devise/registrations/new.html.erb +1 -1
- data/app/views/active_admin/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/active_admin/devise/unlocks/new.html.erb +1 -1
- data/docs/documentation.md +1 -1
- data/features/index/filters.feature +3 -3
- data/features/index/pagination.feature +3 -3
- data/features/registering_assets.feature +4 -8
- data/features/support/env.rb +4 -0
- data/gemfiles/rails_42.gemfile +2 -1
- data/gemfiles/rails_50.gemfile +2 -1
- data/gemfiles/rails_51.gemfile +2 -1
- data/gemfiles/rails_52.gemfile +2 -1
- data/gemfiles/rails_60.gemfile +13 -0
- data/lib/active_admin.rb +1 -0
- data/lib/active_admin/application.rb +4 -3
- data/lib/active_admin/asset_registration.rb +0 -8
- data/lib/active_admin/version.rb +1 -1
- data/lib/bug_report_templates/active_admin_master.rb +3 -4
- data/spec/bug_report_templates_spec.rb +6 -4
- data/spec/support/active_admin_integration_spec_helper.rb +15 -7
- data/spec/support/rails_template.rb +8 -6
- data/spec/unit/asset_registration_spec.rb +0 -29
- data/spec/unit/auto_link_spec.rb +26 -16
- data/spec/unit/comments_spec.rb +22 -7
- data/spec/unit/filters/filter_form_builder_spec.rb +10 -10
- data/spec/unit/form_builder_spec.rb +1 -1
- data/spec/unit/pretty_format_spec.rb +73 -22
- data/spec/unit/resource_controller/data_access_spec.rb +3 -3
- data/spec/unit/routing_spec.rb +1 -1
- data/spec/unit/view_helpers/flash_helper_spec.rb +1 -1
- data/spec/unit/view_helpers/form_helper_spec.rb +2 -2
- data/spec/unit/views/components/attributes_table_spec.rb +1 -1
- metadata +20 -36
- data/vendor/assets/javascripts/jquery-ui/data.js +0 -41
- data/vendor/assets/javascripts/jquery-ui/disable-selection.js +0 -48
- data/vendor/assets/javascripts/jquery-ui/escape-selector.js +0 -23
- data/vendor/assets/javascripts/jquery-ui/focusable.js +0 -86
- data/vendor/assets/javascripts/jquery-ui/ie.js +0 -17
- data/vendor/assets/javascripts/jquery-ui/keycode.js +0 -47
- data/vendor/assets/javascripts/jquery-ui/plugin.js +0 -46
- data/vendor/assets/javascripts/jquery-ui/position.js +0 -500
- data/vendor/assets/javascripts/jquery-ui/safe-active-element.js +0 -42
- data/vendor/assets/javascripts/jquery-ui/safe-blur.js +0 -23
- data/vendor/assets/javascripts/jquery-ui/scroll-parent.js +0 -47
- data/vendor/assets/javascripts/jquery-ui/tabbable.js +0 -38
- data/vendor/assets/javascripts/jquery-ui/unique-id.js +0 -51
- data/vendor/assets/javascripts/jquery-ui/version.js +0 -17
- data/vendor/assets/javascripts/jquery-ui/widget.js +0 -735
- data/vendor/assets/javascripts/jquery-ui/widgets/button.js +0 -391
- data/vendor/assets/javascripts/jquery-ui/widgets/checkboxradio.js +0 -300
- data/vendor/assets/javascripts/jquery-ui/widgets/controlgroup.js +0 -300
- data/vendor/assets/javascripts/jquery-ui/widgets/datepicker.js +0 -2123
- data/vendor/assets/javascripts/jquery-ui/widgets/dialog.js +0 -954
- data/vendor/assets/javascripts/jquery-ui/widgets/draggable.js +0 -1259
- data/vendor/assets/javascripts/jquery-ui/widgets/mouse.js +0 -230
- data/vendor/assets/javascripts/jquery-ui/widgets/resizable.js +0 -1207
- data/vendor/assets/javascripts/jquery-ui/widgets/sortable.js +0 -1561
- data/vendor/assets/javascripts/jquery-ui/widgets/tabs.js +0 -931
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3a41a8ee3cc7e2785ddb82d531a92b44f96bd93228384fcf5641872ca9dbe482
|
4
|
+
data.tar.gz: e3ed462ae8748510d698ac1b79499ac295f8bc4b9667da0324e0e92c3d5df4d0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d7ab0bc94e0895c641b3b64ffd687e0783e9ffcd3cda1a4da783683934939e41a0bea6ba3a2d06e0f61ae5aacb121d3baadfd9726b10cb13caae29536ab50f2c
|
7
|
+
data.tar.gz: 0a0900dba255ecae449f82b5813dc0614a8b57f5b937b6fc94b784bf0d991dc13a7b88d9253c26e7d21064355ba52c7a3ae6c46c422ddc445739498f5b867135
|
data/.gitignore
CHANGED
data/.travis.yml
CHANGED
@@ -10,25 +10,31 @@ bundler_args: --without development
|
|
10
10
|
|
11
11
|
cache: bundler
|
12
12
|
|
13
|
+
before_script:
|
14
|
+
- unset _JAVA_OPTIONS
|
15
|
+
|
13
16
|
before_install:
|
14
17
|
- PATH=$(npm bin):$PATH # needed to install phantomjs via npm
|
15
18
|
- if [ $(phantomjs --version) != '2.1.1' ]; then npm install phantomjs-prebuilt@2.1; fi
|
16
|
-
- gem
|
19
|
+
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
|
20
|
+
- gem install bundler -v '< 2'
|
17
21
|
|
18
22
|
script:
|
19
23
|
- bundle exec rake
|
20
24
|
- bundle exec rake docs:build
|
21
25
|
|
22
26
|
rvm:
|
23
|
-
- jruby-9.
|
24
|
-
- 2.
|
25
|
-
- 2.5.
|
27
|
+
- jruby-9.2.0.0
|
28
|
+
- 2.4
|
29
|
+
- 2.5.5
|
30
|
+
- 2.6
|
26
31
|
|
27
32
|
gemfile:
|
28
33
|
- gemfiles/rails_42.gemfile
|
29
34
|
- gemfiles/rails_50.gemfile
|
30
35
|
- gemfiles/rails_51.gemfile
|
31
36
|
- gemfiles/rails_52.gemfile
|
37
|
+
- gemfiles/rails_60.gemfile
|
32
38
|
|
33
39
|
env:
|
34
40
|
global:
|
@@ -38,12 +44,11 @@ env:
|
|
38
44
|
matrix:
|
39
45
|
fast_finish: true
|
40
46
|
|
41
|
-
|
42
|
-
- rvm:
|
47
|
+
exclude:
|
48
|
+
- rvm: 2.4
|
49
|
+
gemfile: gemfiles/rails_60.gemfile
|
50
|
+
- rvm: 2.6
|
43
51
|
gemfile: gemfiles/rails_42.gemfile
|
44
|
-
|
45
|
-
|
46
|
-
- rvm: jruby-9.
|
47
|
-
gemfile: gemfiles/rails_51.gemfile
|
48
|
-
- rvm: jruby-9.1.15.0
|
49
|
-
gemfile: gemfiles/rails_52.gemfile
|
52
|
+
|
53
|
+
allow_failures:
|
54
|
+
- rvm: jruby-9.2.0.0
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,13 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## 1.5.0 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.4.0...v1.5.0)
|
4
|
+
|
5
|
+
### Enhancements
|
6
|
+
|
7
|
+
#### Major
|
8
|
+
|
9
|
+
* Rails 6.0 support. [#5702] by [@ionut998]
|
10
|
+
|
3
11
|
## 1.4.0 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.3.1...v1.4.0)
|
4
12
|
|
5
13
|
### Enhancements
|
@@ -98,7 +106,6 @@
|
|
98
106
|
|
99
107
|
### Deprecations
|
100
108
|
|
101
|
-
* Deprecated `config.register_stylesheet` and `config.register_javascript`. Import your CSS and JS files in `active_admin.scss` or `active_admin.js`. [#5060] by [@javierjulio]
|
102
109
|
* Deprecated `type` param from `status_tag` and related CSS classes [#4989] by [@javierjulio]
|
103
110
|
* The method signature has changed from:
|
104
111
|
|
@@ -329,6 +336,7 @@ Please check [0-6-stable] for previous changes.
|
|
329
336
|
[#5501]: https://github.com/activeadmin/activeadmin/pull/5501
|
330
337
|
[#5516]: https://github.com/activeadmin/activeadmin/pull/5516
|
331
338
|
[#5583]: https://github.com/activeadmin/activeadmin/pull/5583
|
339
|
+
[#5702]: https://github.com/activeadmin/activeadmin/pull/5702
|
332
340
|
|
333
341
|
[@5t111111]: https://github.com/5t111111
|
334
342
|
[@aarek]: https://github.com/aarek
|
@@ -355,6 +363,7 @@ Please check [0-6-stable] for previous changes.
|
|
355
363
|
[@glebtv]: https://github.com/glebtv
|
356
364
|
[@gonzedge]: https://github.com/gonzedge
|
357
365
|
[@innparusu95]: https://github.com/innparusu95
|
366
|
+
[@ionut998]: https://github.com/ionut998
|
358
367
|
[@jasl]: https://github.com/jasl
|
359
368
|
[@javierjulio]: https://github.com/javierjulio
|
360
369
|
[@jawa]: https://github.com/jawa
|
data/Gemfile
CHANGED
@@ -1,15 +1,9 @@
|
|
1
1
|
source 'https://rubygems.org'
|
2
2
|
|
3
|
-
# Trick to use https without warnings and without having to specify full URLs
|
4
|
-
# TODO: Can be removed when Bundler 2.x is released.
|
5
|
-
git_source(:github) do |repo_name|
|
6
|
-
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
|
7
|
-
"https://github.com/#{repo_name}.git"
|
8
|
-
end
|
9
|
-
|
10
3
|
# Optional dependencies
|
11
4
|
gem 'cancan'
|
12
5
|
gem 'pundit'
|
6
|
+
gem 'jruby-openssl', '~> 0.10.1', platforms: :jruby
|
13
7
|
|
14
8
|
# Utility gems used in both development & test environments
|
15
9
|
gem 'rake'
|
@@ -41,7 +35,7 @@ group :development do
|
|
41
35
|
end
|
42
36
|
|
43
37
|
group :test do
|
44
|
-
gem 'capybara'
|
38
|
+
gem 'capybara'
|
45
39
|
gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
|
46
40
|
gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
|
47
41
|
gem 'cucumber-rails', '~> 1.5', require: false
|
@@ -49,10 +43,8 @@ group :test do
|
|
49
43
|
gem 'database_cleaner'
|
50
44
|
gem 'jasmine'
|
51
45
|
gem 'launchy'
|
52
|
-
gem 'rails-i18n' # Provides default i18n for many languages
|
53
46
|
gem 'rspec-rails'
|
54
47
|
gem 'i18n-spec'
|
55
|
-
gem '
|
56
|
-
gem 'sqlite3', platforms: :mri
|
48
|
+
gem 'sqlite3', '< 1.4', platforms: :mri
|
57
49
|
gem 'poltergeist'
|
58
50
|
end
|
data/activeadmin-rb.gemspec
CHANGED
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
|
|
16
16
|
|
17
17
|
s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
|
18
18
|
|
19
|
-
s.required_ruby_version = '>= 2.
|
19
|
+
s.required_ruby_version = '>= 2.4'
|
20
20
|
|
21
21
|
s.add_dependency 'arbre', '>= 1.1.1'
|
22
22
|
s.add_dependency 'coffee-rails'
|
@@ -24,8 +24,9 @@ Gem::Specification.new do |s|
|
|
24
24
|
s.add_dependency 'formtastic_i18n'
|
25
25
|
s.add_dependency 'inherited_resources', '>= 1.9.0'
|
26
26
|
s.add_dependency 'jquery-rails', '>= 4.2.0'
|
27
|
+
s.add_dependency 'jquery-ui-rails', '~> 6.0'
|
27
28
|
s.add_dependency 'kaminari', '>= 0.15'
|
28
|
-
s.add_dependency 'railties', '>= 4.2'
|
29
|
+
s.add_dependency 'railties', '>= 4.2'
|
29
30
|
s.add_dependency 'ransack', '>= 1.8.7'
|
30
31
|
s.add_dependency 'sass', '~> 3.1'
|
31
32
|
s.add_dependency 'sprockets', '< 4.1'
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div id="login">
|
2
2
|
<h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.resend_confirmation_instructions.title') %></h2>
|
3
3
|
|
4
|
-
<%=
|
4
|
+
<%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
|
5
5
|
<%= active_admin_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
|
6
6
|
f.inputs do
|
7
7
|
f.input :email
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div id="login">
|
2
2
|
<h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.change_password.title') %></h2>
|
3
3
|
|
4
|
-
<%=
|
4
|
+
<%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
|
5
5
|
<%= active_admin_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
|
6
6
|
f.inputs do
|
7
7
|
f.input :password
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div id="login">
|
2
2
|
<h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.reset_password.title') %></h2>
|
3
3
|
|
4
|
-
<%=
|
4
|
+
<%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
|
5
5
|
<%= active_admin_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
|
6
6
|
f.inputs do
|
7
7
|
f.input :email
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.sign_up.title') %></h2>
|
3
3
|
|
4
4
|
<% scope = Devise::Mapping.find_scope!(resource_name) %>
|
5
|
-
<%=
|
5
|
+
<%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
|
6
6
|
<%= active_admin_form_for(resource, as: resource_name, url: send(:"#{scope}_registration_path"), html: { id: "registration_new" }) do |f|
|
7
7
|
f.inputs do
|
8
8
|
resource.class.authentication_keys.each_with_index { |key, index|
|
@@ -0,0 +1,15 @@
|
|
1
|
+
<% if resource.errors.any? %>
|
2
|
+
<div id="error_explanation">
|
3
|
+
<h2>
|
4
|
+
<%= I18n.t("errors.messages.not_saved",
|
5
|
+
count: resource.errors.count,
|
6
|
+
resource: resource.class.model_name.human.downcase)
|
7
|
+
%>
|
8
|
+
</h2>
|
9
|
+
<ul>
|
10
|
+
<% resource.errors.full_messages.each do |message| %>
|
11
|
+
<li><%= message %></li>
|
12
|
+
<% end %>
|
13
|
+
</ul>
|
14
|
+
</div>
|
15
|
+
<% end %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div id="login">
|
2
2
|
<h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.unlock.title') %></h2>
|
3
3
|
|
4
|
-
<%=
|
4
|
+
<%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
|
5
5
|
<%= active_admin_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
|
6
6
|
f.inputs do
|
7
7
|
f.input :email
|
data/docs/documentation.md
CHANGED
@@ -64,10 +64,10 @@ Feature: Index Filtering
|
|
64
64
|
And I press "Filter"
|
65
65
|
|
66
66
|
Then I follow "2"
|
67
|
-
Then I should see "Displaying Posts 3
|
67
|
+
Then I should see "Displaying Posts 3 - 4 of 7 in total"
|
68
68
|
|
69
69
|
Then I follow "3"
|
70
|
-
Then I should see "Displaying Posts 5
|
70
|
+
Then I should see "Displaying Posts 5 - 6 of 7 in total"
|
71
71
|
|
72
72
|
Scenario: Filtering posts while not on the first page
|
73
73
|
Given 9 posts exist
|
@@ -78,7 +78,7 @@ Feature: Index Filtering
|
|
78
78
|
end
|
79
79
|
"""
|
80
80
|
When I follow "2"
|
81
|
-
Then I should see "Displaying Posts 6
|
81
|
+
Then I should see "Displaying Posts 6 - 9 of 9 in total"
|
82
82
|
|
83
83
|
When I fill in "Title" with "Hello World 2"
|
84
84
|
And I press "Filter"
|
@@ -30,7 +30,7 @@ Feature: Index Pagination
|
|
30
30
|
Given 3 posts exist
|
31
31
|
When I am on the index page for posts
|
32
32
|
Then I should see pagination with 2 pages
|
33
|
-
And I should see "Displaying Posts 1
|
33
|
+
And I should see "Displaying Posts 1 - 2 of 3 in total"
|
34
34
|
|
35
35
|
Scenario: Viewing index with pagination disabled
|
36
36
|
Given an index configuration of:
|
@@ -54,10 +54,10 @@ Feature: Index Pagination
|
|
54
54
|
"""
|
55
55
|
Given 11 posts exist
|
56
56
|
When I am on the index page for posts
|
57
|
-
Then I should see "Displaying Posts 1
|
57
|
+
Then I should see "Displaying Posts 1 - 10"
|
58
58
|
And I should not see "11 in total"
|
59
59
|
And I should see the pagination "Next" link
|
60
60
|
|
61
61
|
When I follow "Next"
|
62
|
-
Then I should see "Displaying Posts 11
|
62
|
+
Then I should see "Displaying Posts 11 - 11"
|
63
63
|
And I should not see the pagination "Next" link
|
@@ -18,10 +18,8 @@ Feature: Registering Assets
|
|
18
18
|
Scenario: Registering a CSS file
|
19
19
|
Given a configuration of:
|
20
20
|
"""
|
21
|
-
|
22
|
-
|
23
|
-
ActiveAdmin.register Post
|
24
|
-
end
|
21
|
+
ActiveAdmin.application.register_stylesheet "some-random-css.css", media: :print
|
22
|
+
ActiveAdmin.register Post
|
25
23
|
"""
|
26
24
|
When I am on the index page for posts
|
27
25
|
Then I should see the css file "some-random-css" of media "print"
|
@@ -29,10 +27,8 @@ Feature: Registering Assets
|
|
29
27
|
Scenario: Registering a JS file
|
30
28
|
Given a configuration of:
|
31
29
|
"""
|
32
|
-
|
33
|
-
|
34
|
-
ActiveAdmin.register Post
|
35
|
-
end
|
30
|
+
ActiveAdmin.application.register_javascript "some-random-js.js"
|
31
|
+
ActiveAdmin.register Post
|
36
32
|
"""
|
37
33
|
When I am on the index page for posts
|
38
34
|
Then I should see the js file "some-random-js"
|
data/features/support/env.rb
CHANGED
@@ -55,6 +55,10 @@ require 'phantomjs/poltergeist'
|
|
55
55
|
|
56
56
|
Capybara.javascript_driver = :poltergeist
|
57
57
|
|
58
|
+
Capybara.server = :webrick
|
59
|
+
|
60
|
+
Capybara.asset_host = 'http://localhost:3000'
|
61
|
+
|
58
62
|
# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
|
59
63
|
# order to ease the transition to Capybara we set the default here. If you'd
|
60
64
|
# prefer to use XPath just remove this line and adjust any selectors in your
|
data/gemfiles/rails_42.gemfile
CHANGED
@@ -6,6 +6,7 @@ gem "rails", "4.2.10"
|
|
6
6
|
gem "devise", "~> 4.4" # required for Ruby 2.5, see devise/issues/4736
|
7
7
|
gem "draper", "~> 2.1"
|
8
8
|
gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
|
9
|
-
gem "
|
9
|
+
gem "rails-i18n"
|
10
|
+
gem "activerecord-jdbcsqlite3-adapter", "~> 1.3", platforms: :jruby
|
10
11
|
|
11
12
|
gemspec path: "../"
|
data/gemfiles/rails_50.gemfile
CHANGED
@@ -6,6 +6,7 @@ gem "rails", "5.0.7"
|
|
6
6
|
gem "devise", "~> 4.0"
|
7
7
|
gem "draper", "~> 3.0"
|
8
8
|
gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
|
9
|
-
gem "
|
9
|
+
gem "rails-i18n"
|
10
|
+
gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platforms: :jruby
|
10
11
|
|
11
12
|
gemspec path: "../"
|
data/gemfiles/rails_51.gemfile
CHANGED
@@ -6,6 +6,7 @@ gem "rails", "5.1.6"
|
|
6
6
|
gem "devise", "~> 4.3"
|
7
7
|
gem "draper", "~> 3.0"
|
8
8
|
gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
|
9
|
-
gem "
|
9
|
+
gem "rails-i18n"
|
10
|
+
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platforms: :jruby
|
10
11
|
|
11
12
|
gemspec path: "../"
|
data/gemfiles/rails_52.gemfile
CHANGED
@@ -7,6 +7,7 @@ gem "bootsnap"
|
|
7
7
|
gem "devise", "~> 4.4"
|
8
8
|
gem "draper", "~> 3.0"
|
9
9
|
gem "ransack", "2.0" # 2.x for Rails 5.2+ only.
|
10
|
-
gem "
|
10
|
+
gem "rails-i18n"
|
11
|
+
gem "activerecord-jdbcsqlite3-adapter", ">= 52.0", platforms: :jruby
|
11
12
|
|
12
13
|
gemspec path: "../"
|
@@ -0,0 +1,13 @@
|
|
1
|
+
source "https://rubygems.org"
|
2
|
+
|
3
|
+
eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
|
4
|
+
|
5
|
+
gem "rails", ">= 6.0.x"
|
6
|
+
gem "rails-i18n", ">= 6.0.x"
|
7
|
+
gem "bootsnap"
|
8
|
+
gem "devise", "~> 4.4"
|
9
|
+
gem "draper", "~> 3.0"
|
10
|
+
gem "ransack", ">= 2.0" # 2.x for Rails 5.2+ only.
|
11
|
+
gem "activerecord-jdbcsqlite3-adapter", ">= 52.0", platforms: :jruby
|
12
|
+
|
13
|
+
gemspec path: "../"
|
data/lib/active_admin.rb
CHANGED
@@ -171,9 +171,10 @@ module ActiveAdmin
|
|
171
171
|
private
|
172
172
|
|
173
173
|
def register_default_assets
|
174
|
-
|
175
|
-
|
176
|
-
|
174
|
+
register_stylesheet 'active_admin.css', media: 'screen'
|
175
|
+
register_stylesheet 'active_admin/print.css', media: 'print'
|
176
|
+
|
177
|
+
register_javascript 'active_admin.js'
|
177
178
|
end
|
178
179
|
|
179
180
|
# Since app/admin is alphabetically before app/models, we have to remove it
|
@@ -2,10 +2,6 @@ module ActiveAdmin
|
|
2
2
|
module AssetRegistration
|
3
3
|
|
4
4
|
def register_stylesheet(path, options = {})
|
5
|
-
Deprecation.warn <<-MSG.strip_heredoc
|
6
|
-
The `register_stylesheet` config is deprecated and will be removed
|
7
|
-
in v2. Import your "#{path}" stylesheet in the active_admin.scss.
|
8
|
-
MSG
|
9
5
|
stylesheets[path] = options
|
10
6
|
end
|
11
7
|
|
@@ -18,10 +14,6 @@ module ActiveAdmin
|
|
18
14
|
end
|
19
15
|
|
20
16
|
def register_javascript(name)
|
21
|
-
Deprecation.warn <<-MSG.strip_heredoc
|
22
|
-
The `register_javascript` config is deprecated and will be removed
|
23
|
-
in v2. Import your "#{name}" javascript in the active_admin.js.
|
24
|
-
MSG
|
25
17
|
javascripts.add name
|
26
18
|
end
|
27
19
|
|
data/lib/active_admin/version.rb
CHANGED