Update merit.rb

Fix suggested @ merit-gem#173
bigredpen · Jul 30, 2016 · 08b1d2e · 08b1d2e
1 parent e16dfa6
commit 08b1d2e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/merit.rb b/lib/merit.rb
@@ -85,8 +85,8 @@ class Engine < Rails::Engine
       ActiveSupport.on_load(:action_controller) do
         begin
           # Load app rules on boot up
-          Merit::AppBadgeRules = Merit::BadgeRules.new.defined_rules
-          Merit::AppPointRules = Merit::PointRules.new.defined_rules
+          Merit::AppBadgeRules ||= Merit::BadgeRules.new.defined_rules
+          Merit::AppPointRules ||= Merit::PointRules.new.defined_rules
           include Merit::ControllerExtensions
         rescue NameError => e
           # Trap NameError if installing/generating files