Merge pull request #404 from djones/master

Rails 5: ActionDispatch::Reloader#to_prepare is deprecated
Shopify · Apr 13, 2017 · addd46f · addd46f
2 parents 291518a + fae3b24
commit addd46f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/example/config/initializers/shopify_session_repository.rb b/example/config/initializers/shopify_session_repository.rb
@@ -1,7 +1,9 @@
 if Rails.configuration.cache_classes
   ShopifyApp::SessionRepository.storage = Shop
 else
-  ActionDispatch::Reloader.to_prepare do
+  reloader = defined?(ActiveSupport::Reloader) ? ActiveSupport::Reloader : ActionDispatch::Reloader
+
+  reloader.to_prepare do
     ShopifyApp::SessionRepository.storage = Shop
   end
 end
diff --git a/lib/generators/shopify_app/shop_model/templates/shopify_session_repository.rb b/lib/generators/shopify_app/shop_model/templates/shopify_session_repository.rb
@@ -1,7 +1,9 @@
 if Rails.configuration.cache_classes
   ShopifyApp::SessionRepository.storage = Shop
 else
-  ActionDispatch::Reloader.to_prepare do
+  reloader = defined?(ActiveSupport::Reloader) ? ActiveSupport::Reloader : ActionDispatch::Reloader
+
+  reloader.to_prepare do
     ShopifyApp::SessionRepository.storage = Shop
   end
 end