Merge pull request #1205 from anthonyshull/develop

support rails 7
pat · Sep 18, 2021 · 83785e0 · 83785e0
2 parents 479a980 + 869010f
commit 83785e0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/thinking_sphinx/railtie.rb b/lib/thinking_sphinx/railtie.rb
@@ -14,8 +14,9 @@ class ThinkingSphinx::Railtie < Rails::Railtie
       require 'thinking_sphinx/active_record'
     end
 
-    if ActiveSupport::VERSION::MAJOR > 5 &&
-      Rails.application.config.autoloader == :zeitwerk
+    if ActiveSupport::VERSION::MAJOR == 7 ||
+       (ActiveSupport::VERSION::MAJOR > 5 &&
+        Rails.application.config.autoloader == :zeitwerk)
       ActiveSupport::Dependencies.autoload_paths.delete(
         Rails.root.join("app", "indices").to_s
       )