Merge pull request #926 from sonalkr132/mailer-tests

Mailer fixes and tests
2016-04-08 11:43:03 -06:00 · 2016-04-08 11:43:03 -06:00 · 86449eea67
commit 86449eea67
parent 00d6382ffa 639c258152
6 changed files with 91 additions and 7 deletions
--- a/app/models/email_settings.rb
+++ b/app/models/email_settings.rb
@ -1,4 +1,6 @@
 class EmailSettings < ActiveRecord::Base
+  belongs_to :conference
+
  def get_values(conference, user, event = nil)
    h = {
      'email' => user.email,