Make ActiveStorage/ActionText detection less likely to cause false po…

…sitives Closes #3659
railsadminteam · Jan 7, 2024 · 073b809 · 073b809
1 parent 5c21878
commit 073b809
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/assets/javascripts/rails_admin/application.js.erb b/app/assets/javascripts/rails_admin/application.js.erb
@@ -21,10 +21,10 @@
 //=  require 'rails_admin/ui'
 //=  require 'rails_admin/custom/ui'
 
-<% if defined?(ActiveStorage) %>
+<% if defined?(ActiveStorage::Engine) %>
 //= require activestorage
 <% end %>
-<% if defined?(ActionText) && Rails.gem_version >= Gem::Version.new('7.0') %>
+<% if defined?(ActionText::Engine) && Rails.gem_version >= Gem::Version.new('7.0') %>
 //= require trix
 //= require actiontext
 <% end %>
diff --git a/app/assets/stylesheets/rails_admin/application.scss.erb b/app/assets/stylesheets/rails_admin/application.scss.erb
@@ -30,6 +30,6 @@
 @import "rails_admin/styles/base/theming";
 @import "rails_admin/custom/theming";
 
-<% if defined?(ActionText) && Rails.gem_version >= Gem::Version.new('7.0') %>
+<% if defined?(ActionText::Engine) && Rails.gem_version >= Gem::Version.new('7.0') %>
 @import "trix";
 <% end %>