Merge pull request #282 from redtachyons/patch-1

Run action controller load hook only once
merit-gem · Nov 3, 2017 · 5d7ed51 · 5d7ed51
2 parents f9f3982 + 3d5f3ab
commit 5d7ed51
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,4 +8,4 @@ rvm:
 
 env:
   - RAILS_VERSION=5.0.3
-  - RAILS_VERSION=5.1
+  - RAILS_VERSION=5.1.1
diff --git a/lib/merit.rb b/lib/merit.rb
@@ -82,7 +82,7 @@ class Engine < Rails::Engine
     initializer 'merit.controller' do |app|
       extend_orm_with_has_merit
       require_models
-      ActiveSupport.on_load(:action_controller) do
+      ActiveSupport.on_load(:action_controller, run_once: true) do
         begin
           # Load app rules on boot up
           Merit::AppBadgeRules = Merit::BadgeRules.new.defined_rules