From 2dd932d89330080174fefa9f84eb83020f2f039c Mon Sep 17 00:00:00 2001
From: Hugo Melo <hugo@riseup.net>
Date: Tue, 13 Oct 2015 17:41:43 -0300
Subject: [PATCH] Avoid error on CONFERENCE_RULES not defined

---
 views/gamification_plugin_badges/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/gamification_plugin_badges/_form.html.erb b/views/gamification_plugin_badges/_form.html.erb
index 0f351f1..1538751 100644
--- a/views/gamification_plugin_badges/_form.html.erb
+++ b/views/gamification_plugin_badges/_form.html.erb
@@ -12,7 +12,7 @@
   <% end %>
 
   <% rules =  Merit::BadgeRules::AVAILABLE_RULES %>
-  <% rules.merge! Merit::BadgeRules::CONFERENCE_RULES %>
+  <% rules.merge! Merit::BadgeRules::CONFERENCE_RULES if defined? Merit::BadgeRules::CONFERENCE_RULES %>
   <div class="field" id="gamification-plugin-form-badge-name">
     <%= f.label :name %><br />
     <%= f.select :name, rules.map{ |key, rule| key } %>
--
libgit2 0.21.2