Merge pull request #1 from lennartbuit/rails5

Rails 5 compatibility
nedap · Sep 18, 2018 · 70057c4 · 70057c4
2 parents 0fe5669 + 2c10d73
commit 70057c4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/samsara/controller.rb b/lib/samsara/controller.rb
@@ -2,8 +2,8 @@ module Samsara::Controller
   extend ActiveSupport::Concern
 
   included do
-    before_filter :set_samsara_context
-    after_filter  :unset_samsara_context
+    before_action :set_samsara_context
+    after_action  :unset_samsara_context
   end
 
   def set_samsara_context