From 15064ad6c009bbb42bd09f89d6087ad1a6693e5f Mon Sep 17 00:00:00 2001 From: Bert Owen Date: Mon, 21 Apr 2014 10:39:08 -0700 Subject: [PATCH] VRFS-1567 fix default sender, add new migration for email_batches table --- db/manifest | 1 + db/up/email_change_default_sender.sql | 1 + ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb | 2 +- ruby/lib/jam_ruby/app/mailers/user_mailer.rb | 2 +- ruby/lib/jam_ruby/models/email_batch.rb | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 db/up/email_change_default_sender.sql diff --git a/db/manifest b/db/manifest index 232cb12ef..843c69235 100755 --- a/db/manifest +++ b/db/manifest @@ -143,3 +143,4 @@ emails.sql email_batch.sql user_progress_tracking2.sql bands_did_session.sql +email_change_default_sender.sql \ No newline at end of file diff --git a/db/up/email_change_default_sender.sql b/db/up/email_change_default_sender.sql new file mode 100644 index 000000000..e729980f0 --- /dev/null +++ b/db/up/email_change_default_sender.sql @@ -0,0 +1 @@ +ALTER TABLE email_batches ALTER column from_email SET DEFAULT 'noreply@jamkazam.com'::character varying; \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb index 566cd7d22..e01846424 100644 --- a/ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb +++ b/ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb @@ -9,7 +9,7 @@ module JamRuby class InvitedUserMailer < ActionMailer::Base include SendGrid - DEFAULT_SENDER = "support@jamkazam.com" + DEFAULT_SENDER = "noreply@jamkazam.com" default :from => DEFAULT_SENDER diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb index f0909d7eb..cd7134591 100644 --- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb +++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb @@ -11,7 +11,7 @@ layout "user_mailer" - DEFAULT_SENDER = "support@jamkazam.com" + DEFAULT_SENDER = "noreply@jamkazam.com" default :from => DEFAULT_SENDER diff --git a/ruby/lib/jam_ruby/models/email_batch.rb b/ruby/lib/jam_ruby/models/email_batch.rb index 309b63305..74dff06ec 100644 --- a/ruby/lib/jam_ruby/models/email_batch.rb +++ b/ruby/lib/jam_ruby/models/email_batch.rb @@ -12,7 +12,7 @@ module JamRuby VAR_FIRST_NAME = '@FIRSTNAME' VAR_LAST_NAME = '@LASTNAME' - DEFAULT_SENDER = "support@jamkazam.com" + DEFAULT_SENDER = "noreply@jamkazam.com" BATCH_SIZE = 1000 BODY_TEMPLATE =<