Skip to content

Commit 073b809

Browse files
committed
Make ActiveStorage/ActionText detection less likely to cause false positives
Closes #3659
1 parent 5c21878 commit 073b809

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

app/assets/javascripts/rails_admin/application.js.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
//= require 'rails_admin/ui'
2222
//= require 'rails_admin/custom/ui'
2323

24-
<% if defined?(ActiveStorage) %>
24+
<% if defined?(ActiveStorage::Engine) %>
2525
//= require activestorage
2626
<% end %>
27-
<% if defined?(ActionText) && Rails.gem_version >= Gem::Version.new('7.0') %>
27+
<% if defined?(ActionText::Engine) && Rails.gem_version >= Gem::Version.new('7.0') %>
2828
//= require trix
2929
//= require actiontext
3030
<% end %>

app/assets/stylesheets/rails_admin/application.scss.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
@import "rails_admin/styles/base/theming";
3131
@import "rails_admin/custom/theming";
3232

33-
<% if defined?(ActionText) && Rails.gem_version >= Gem::Version.new('7.0') %>
33+
<% if defined?(ActionText::Engine) && Rails.gem_version >= Gem::Version.new('7.0') %>
3434
@import "trix";
3535
<% end %>

0 commit comments

Comments
 (0)