Merge 3bfed84 into 91e9ff5

cookpad · Mar 8, 2017 · 7cfcb3e · 7cfcb3e
2 parents 91e9ff5 + 3bfed84
commit 7cfcb3e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/chanko/controller.rb b/lib/chanko/controller.rb
@@ -8,8 +8,14 @@ module ClassMethods
       def inherited(base)
         if Config.auto_reload && base.name == "ApplicationController"
           base.class_eval do
-            prepend_before_filter do
-              Chanko::Loader.cache.clear
+            if Rails::VERSION::MAJOR >= 5
+              prepend_before_action do
+                Chanko::Loader.cache.clear
+              end
+            else
+              prepend_before_filter do
+                Chanko::Loader.cache.clear
+              end
             end
           end
         end